diff --git a/Makefile.am b/Makefile.am
index 81847928..de0a32f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,24 +63,24 @@ defconfig.h: awesomerc
 
 CLEANFILES    += uicbgen.h
 BUILT_SOURCES += uicbgen.h
-EXTRA_DIST    += uicbgen.sh
+EXTRA_DIST    += build-utils/uicbgen.sh
 uicbgen.h: $(awesome_SOURCES)
 	@echo "generating uicbgen.h from headers file"
-	@$(top_srcdir)/uicbgen.sh > $(top_srcdir)/uicbgen.h
+	$(top_srcdir)/build-utils/uicbgen.sh > $(top_srcdir)/uicbgen.h
 
 CLEANFILES    += layoutgen.h
 BUILT_SOURCES += layoutgen.h
-EXTRA_DIST    += layoutgen.sh
+EXTRA_DIST    += build-utils/layoutgen.sh
 layoutgen.h: $(awesome_SOURCES)
 	@echo "generating layoutgen.h from layouts headers file"
-	@$(top_srcdir)/layoutgen.sh > $(top_srcdir)/layoutgen.h
+	$(top_srcdir)/build-utils/layoutgen.sh > $(top_srcdir)/layoutgen.h
 
 CLEANFILES    += widgetgen.h
 BUILT_SOURCES += widgetgen.h
-EXTRA_DIST    += widgetgen.sh
+EXTRA_DIST    += build-utils/widgetgen.sh
 widgetgen.h: widget.h
 	@echo "generating widgetgen.h from widget.h"
-	@$(top_srcdir)/widgetgen.sh > $(top_srcdir)/widgetgen.h
+	$(top_srcdir)/build-utils/widgetgen.sh > $(top_srcdir)/widgetgen.h
 
 if USING_GCC
 # If you are using gcc, and want to deactivate this default set of
diff --git a/layoutgen.sh b/build-utils/layoutgen.sh
similarity index 100%
rename from layoutgen.sh
rename to build-utils/layoutgen.sh
diff --git a/uicbgen.sh b/build-utils/uicbgen.sh
similarity index 100%
rename from uicbgen.sh
rename to build-utils/uicbgen.sh
diff --git a/widgetgen.sh b/build-utils/widgetgen.sh
similarity index 100%
rename from widgetgen.sh
rename to build-utils/widgetgen.sh