diff --git a/Classes/GHNSURL+Utils.m b/Classes/GHNSURL+Utils.m
index 7b140bc..a6f53b5 100644
--- a/Classes/GHNSURL+Utils.m
+++ b/Classes/GHNSURL+Utils.m
@@ -149,6 +149,8 @@ + (NSString *)gh_escapeAll:(NSString *)s {
 
 + (NSString *)gh_decode:(NSString *)s {
 	if (!s) return nil;
+	// CFURLCreateStringByReplacingPercentEscapes doesn't handle spaces that are encoded as '+'
+	s = [s stringByReplacingOccurrencesOfString:@"+" withString:@" "];
 	return [NSMakeCollectable(CFURLCreateStringByReplacingPercentEscapes(NULL, (CFStringRef)s, CFSTR(""))) autorelease];
 }