diff --git a/.gitignore b/.gitignore
index 0913ceb3c..94a9081fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,23 +35,12 @@ Makefile
 /config.status
 /libtool
 /stamp-h1
-/apps/blueman-adapters
-/apps/blueman-applet
-/apps/blueman-assistant
-/apps/blueman-manager
-/apps/blueman-mechanism
-/apps/blueman-report
-/apps/blueman-rfcomm-watcher
-/apps/blueman-sendto
-/apps/blueman-services
-/apps/blueman-tray
 /blueman/Constants.py
 /data/configs/blueman-applet.service
 /data/configs/blueman-mechanism.service
 /data/configs/org.blueman.Applet.service
 /data/configs/org.blueman.Mechanism.service
 /module/.deps
-/module/_blueman.pyx
 /po/POTFILES
 /po/stamp-it
 
diff --git a/apps/Makefile.am b/apps/Makefile.am
index f643946b5..3df6f5a9d 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -1,4 +1,4 @@
-APPS =					\
+APPS =				\
 	blueman-adapters	\
 	blueman-applet		\
 	blueman-manager		\
@@ -18,8 +18,4 @@ polkit_SCRIPTS = 	\
 helpersdir = $(libexecdir)
 helpers_SCRIPTS = blueman-rfcomm-watcher
 
-ALL_APPS = $(APPS) $(polkit_SCRIPTS) $(helpers_SCRIPTS)
-	
-EXTRA_DIST = $(ALL_APPS) $(addsuffix .in, $(ALL_APPS))
-
-CLEANFILES = $(ALL_APPS)
+EXTRA_DIST = $(APPS) $(polkit_SCRIPTS) $(helpers_SCRIPTS)
diff --git a/apps/blueman-adapters.in b/apps/blueman-adapters
similarity index 100%
rename from apps/blueman-adapters.in
rename to apps/blueman-adapters
diff --git a/apps/blueman-applet.in b/apps/blueman-applet
similarity index 100%
rename from apps/blueman-applet.in
rename to apps/blueman-applet
diff --git a/apps/blueman-assistant.in b/apps/blueman-assistant
similarity index 100%
rename from apps/blueman-assistant.in
rename to apps/blueman-assistant
diff --git a/apps/blueman-manager.in b/apps/blueman-manager
similarity index 100%
rename from apps/blueman-manager.in
rename to apps/blueman-manager
diff --git a/apps/blueman-mechanism.in b/apps/blueman-mechanism
similarity index 100%
rename from apps/blueman-mechanism.in
rename to apps/blueman-mechanism
diff --git a/apps/blueman-report.in b/apps/blueman-report
similarity index 100%
rename from apps/blueman-report.in
rename to apps/blueman-report
diff --git a/apps/blueman-rfcomm-watcher.in b/apps/blueman-rfcomm-watcher
similarity index 100%
rename from apps/blueman-rfcomm-watcher.in
rename to apps/blueman-rfcomm-watcher
diff --git a/apps/blueman-sendto.in b/apps/blueman-sendto
similarity index 100%
rename from apps/blueman-sendto.in
rename to apps/blueman-sendto
diff --git a/apps/blueman-services.in b/apps/blueman-services
similarity index 100%
rename from apps/blueman-services.in
rename to apps/blueman-services
diff --git a/apps/blueman-tray.in b/apps/blueman-tray
similarity index 100%
rename from apps/blueman-tray.in
rename to apps/blueman-tray
diff --git a/configure.ac b/configure.ac
index 40d7fd1c1..79445af64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,16 +255,6 @@ GLIB_GSETTINGS
 
 AC_OUTPUT([
 Makefile
-apps/blueman-adapters
-apps/blueman-applet
-apps/blueman-assistant
-apps/blueman-manager
-apps/blueman-mechanism
-apps/blueman-report
-apps/blueman-rfcomm-watcher
-apps/blueman-sendto
-apps/blueman-services
-apps/blueman-tray
 apps/Makefile
 blueman/Makefile
 blueman/Constants.py
@@ -327,7 +317,6 @@ data/configs/blueman-applet.service
 data/configs/blueman-mechanism.service
 data/configs/org.blueman.Applet.service
 data/configs/org.blueman.Mechanism.service
-module/_blueman.pyx
 module/Makefile
 po/Makefile.in
 sendto/Makefile
diff --git a/module/_blueman.pyx.in b/module/_blueman.pyx
similarity index 100%
rename from module/_blueman.pyx.in
rename to module/_blueman.pyx