diff --git a/Makefile b/Makefile
index 2f339a8..7985268 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ dev: build tags
 
 build: dist/setup-config
 	if ! $(CABAL) build; then $(CABAL) configure; $(CABAL) build; fi
-	ln -sf dist/build/config/config propellor
+	ln -sf dist/build/propellor-config/propellor-config propellor
 
 deps:
 	@if [ $$(whoami) = root ]; then apt-get --no-upgrade --no-install-recommends -y install gnupg ghc cabal-install libghc-missingh-dev libghc-ansi-terminal-dev libghc-ifelse-dev libghc-unix-compat-dev libghc-hslogger-dev libghc-network-dev libghc-quickcheck2-dev libghc-mtl-dev libghc-monadcatchio-transformers-dev; fi || true
@@ -19,13 +19,13 @@ dist/setup-config: propellor.cabal
 
 install:
 	install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
-	install -s dist/build/wrapper/wrapper $(DESTDIR)/usr/bin/propellor
+	install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor
 	$(CABAL) sdist
 	cat dist/propellor-*.tar.gz | \
 		(cd $(DESTDIR)/usr/src/propellor && tar zx --strip-components=1)
 
 clean:
-	rm -rf dist Setup tags propellor propellor-wrapper privdata/local
+	rm -rf dist Setup tags propellor privdata/local
 	find -name \*.o -exec rm {} \;
 	find -name \*.hi -exec rm {} \;
 
diff --git a/propellor.cabal b/propellor.cabal
index ff361da..2ac8a44 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -33,7 +33,7 @@ Description:
  .
  It is configured using haskell.
 
-Executable wrapper
+Executable propellor
   Main-Is: wrapper.hs
   GHC-Options: -Wall -threaded -O0
   Hs-Source-Dirs:  src
@@ -45,7 +45,7 @@ Executable wrapper
   if (! os(windows))
     Build-Depends: unix
 
-Executable config
+Executable propellor-config
   Main-Is: config.hs
   GHC-Options: -Wall -threaded -O0
   Hs-Source-Dirs:  src