diff --git a/Docs/src/history.but b/Docs/src/history.but
index c74aab08..ca1f451e 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -16,12 +16,14 @@ ANSI targets are deprecated, consider moving to Unicode.
 
 \b Added \R{loadandsetimage}{LoadAndSetImage}
 
-\b Fixed -O stderr stream issue (\W{http://sf.net/p/nsis/bugs/1221}{bug #1221})
-
 \b Allow quoted library path in System::Call (\W{http://sf.net/p/nsis/bugs/546}{bug #546})
 
 \b %1 in !finalize command can be specified multiple times
 
+\b Fixed -O stderr stream issue (\W{http://sf.net/p/nsis/bugs/1221}{bug #1221})
+
+\b Fixed InstallLib .NSI space-in-path bug (\W{http://sf.net/p/nsis/bugs/1222}{bug #1222})
+
 
 \S2{} Translations
 
diff --git a/Include/Library.nsh b/Include/Library.nsh
index 41bcea65..56eed98c 100644
--- a/Include/Library.nsh
+++ b/Include/Library.nsh
@@ -148,8 +148,8 @@
 
 !macro __InstallLib_Helper_CmpPackedVer64 oldhi oldlo newhi newlo jeq jle jgt
 
-  IntCmpU ${oldhi} ${newhi} 0      ${jle} ${jgt}
-  IntCmpU ${oldlo} ${newlo} ${jeq} ${jle} ${jgt}
+  IntCmpU ${oldhi} ${newhi} "0"      "${jle}" "${jgt}"
+  IntCmpU ${oldlo} ${newlo} "${jeq}" "${jle}" "${jgt}"
 
 !macroend