diff --git a/configure.in b/configure.in
index c3f73acf6..c4d1e194e 100644
--- a/configure.in
+++ b/configure.in
@@ -287,8 +287,6 @@ src/modules/ibox/Makefile
 src/modules/ibox/module.desktop
 src/modules/start/Makefile
 src/modules/start/module.desktop
-src/modules/layout/Makefile
-src/modules/layout/module.desktop
 src/modules/exebuf/Makefile
 src/modules/exebuf/module.desktop
 src/modules/winlist/Makefile
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index a8bdc7b06..0d9eb175c 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -8,7 +8,6 @@ battery \
 cpufreq \
 ibox \
 start \
-layout \
 exebuf \
 winlist \
 fileman \
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index fdfa2f7cc..6d1d3d245 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -27,14 +27,8 @@ module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
 batgetdir = $(pkgdir)
-batget_DATA = \
-batget$(EXEEXT)
 
-x_mode = a=rx,u+x
-install-data-hook:
-	@chmod $(x_mode) $(DESTDIR)$(batgetdir)/batget$(EXEEXT) || true
-
-noinst_PROGRAMS        = batget
+batget_PROGRAMS        = batget
 batget_SOURCES         = batget.c
 batget_LDFLAGS         = @BATTERY_LIBS@
 
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index a4671b949..3aa7080d5 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -25,14 +25,14 @@ module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
 freqsetdir = $(pkgdir)
-freqset_DATA = \
-freqset$(EXEEXT)
 
 setuid_root_mode = a=rx,u+xs
+setuid_root_user = root
 install-data-hook:
+	@chown $(setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
 	@chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
 
-noinst_PROGRAMS        = freqset
+freqset_PROGRAMS       = freqset
 freqset_SOURCES        = freqset.c
 
 uninstall:
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index c9c7d2788..4cb65fa4a 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -26,14 +26,8 @@ module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
 
 tempgetdir = $(pkgdir)
-tempget_DATA = \
-tempget$(EXEEXT)
 
-x_mode = a=rx,u+x
-install-data-hook:
-	@chmod $(x_mode) $(DESTDIR)$(tempgetdir)/tempget$(EXEEXT) || true
-
-noinst_PROGRAMS        = tempget
+tempget_PROGRAMS       = tempget
 tempget_SOURCES        = tempget.c
 tempget_LDFLAGS        = @TEMPERATURE_LIBS@