diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..263e13a
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+propellor.1
diff --git a/debian/propellor.1 b/propellor.1
similarity index 100%
rename from debian/propellor.1
rename to propellor.1
diff --git a/propellor.cabal b/propellor.cabal
index c492fb6..9f33dd8 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -18,13 +18,14 @@ Extra-Source-Files:
   config-simple.hs
   config-joey.hs
   config.hs
+  propellor.1
   debian/changelog
   debian/README.Debian
-  debian/propellor.1
   debian/compat
   debian/control
   debian/copyright
   debian/rules
+  debian/manpages
 Synopsis: property-based host configuration management in haskell
 Description:
  Propellor enures that the system it's run in satisfies a list of
diff --git a/src/wrapper.hs b/src/wrapper.hs
index 75830e7..106591f 100644
--- a/src/wrapper.hs
+++ b/src/wrapper.hs
@@ -71,6 +71,8 @@ wrapper args propellordir propellorbin = do
 			( do			
 				void $ boolSystem "git" [Param "clone", File distrepo, File propellordir]
 				fetchUpstreamBranch propellordir distrepo
+				changeWorkingDirectory propellordir
+				void $ boolSystem "git" [Param "remote", Param "rm", Param "origin"]
 			, void $ boolSystem "git" [Param "clone", Param netrepo, File propellordir]
 			)