2 files changed, 8 insertions, 6 deletions
diff --git a/windows/make-windows-installer.bat b/windows/make-windows-installer.bat
index 5890479ae..d27859057 100644
--- a/windows/make-windows-installer.bat
+++ b/windows/make-windows-installer.bat
@@ -2,12 +2,14 @@
 cd ..
 cabal update
 cabal-dev clean
+cabal install hsb2hs cabal-dev
 if %errorlevel% neq 0 exit /b %errorlevel%
-cabal-dev install hsb2hs
-cabal-dev install --only-dependencies --force --reinstall --flags="embed_data_files"
-cabal-dev install --reinstall --flags="embed_data_files"
+cabal-dev install -v1 --force --reinstall --flags="embed_data_files"
+if %errorlevel% neq 0 exit /b %errorlevel%
+cabal-dev install -v1 --reinstall --flags="embed_data_files" pandoc-citeproc
 if %errorlevel% neq 0 exit /b %errorlevel%
 strip cabal-dev\bin\pandoc.exe
+strip cabal-dev\bin\pandoc-citeproc.exe
 cabal-dev\bin\pandoc.exe -s --template data\templates\default.html -S README -o README.html
 if %errorlevel% neq 0 exit /b %errorlevel%
 cabal-dev\bin\pandoc.exe -s --template data\templates\default.rtf COPYING -t rtf -S -o COPYING.rtf
diff --git a/windows/pandoc.wxs b/windows/pandoc.wxs
index 2c87e41e9..7a20effe5 100644
--- a/windows/pandoc.wxs
+++ b/windows/pandoc.wxs
@@ -55,11 +55,8 @@
           Guid="0A214839-2E69-4026-8DBB-0F0A9DB75C12">
             <RegistryValue Root="HKMU" Key="Software\John MacFarlane\Pandoc"
             Name="Version" Type="string" Value="[ProductVersion]" KeyPath="yes"/>
-            <RemoveFolder Id="APPLICATIONFOLDER" On="uninstall"/>
             <File Id="pandoc_citeprocEXE" Name="pandoc-citeproc.exe"
             Source="..\cabal-dev\bin\pandoc-citeproc.exe" />
-            <File Id="biblio2yamlEXE" Name="biblio2yaml.exe"
-            Source="..\cabal-dev\bin\biblio2yaml.exe" />
           </Component>
 
           <Component Id="UpdatePathUser"
@@ -113,6 +110,9 @@
         <ComponentRef Id="Documentation" />
         <ComponentRef Id="ApplicationShortcut" />
       </Feature>
+      <Feature Id="Citation" Title="Citation Support" Description="Citation support.">
+        <ComponentRef Id="CitationSupport" />
+      </Feature>
     </Feature>
 
     <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONFOLDER" />