diff --git a/.gitignore b/.gitignore
index 70dba09b292..66daccf5d35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@
 .directory
 *.man
 .vscode
-Makefile
 autom4te.cache/
 config.log
 config.mk
@@ -25,7 +24,6 @@ firejail.1
 firemon.1
 firecfg.1
 jailcheck.1
-mkdeb.sh
 src/fnettrace-dns/fnettrace-dns
 src/fnettrace-sni/fnettrace-sni
 src/firejail/firejail
@@ -57,7 +55,6 @@ seccomp.64
 seccomp.block_secondary
 seccomp.mdwx
 seccomp.mdwx.32
-src/common.mk
 aclocal.m4
 __pycache__
 *.pyc
diff --git a/Makefile.in b/Makefile
similarity index 96%
rename from Makefile.in
rename to Makefile
index 4d99836721a..c235aff7c0f 100644
--- a/Makefile.in
+++ b/Makefile
@@ -85,7 +85,7 @@ distclean: clean
 		$(MAKE) -C $$dir distclean; \
 	done
 	$(MAKE) -C test distclean
-	rm -fr Makefile autom4te.cache config.log config.mk config.sh config.status src/common.mk mkdeb.sh
+	rm -fr autom4te.cache config.log config.mk config.sh config.status
 
 realinstall:
 	# firejail executable
@@ -189,7 +189,7 @@ uninstall:
 
 DISTFILES = \
 COPYING \
-Makefile.in \
+Makefile \
 README \
 RELNOTES \
 config.mk.in \
@@ -200,20 +200,18 @@ contrib \
 etc \
 install.sh \
 m4 \
-mkdeb.sh.in \
+mkdeb.sh \
 mketc.sh \
 mkman.sh \
 platform \
 src
 
-DISTFILES_TEST = test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot
+DISTFILES_TEST = test/Makefile test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot
 
 dist:
 	mv config.sh config.sh.old
 	mv config.status config.status.old
-	mv mkdeb.sh mkdeb.sh.old
 	make distclean
-	mv mkdeb.sh.old mkdeb.sh
 	mv config.status.old config.status
 	mv config.sh.old config.sh
 	rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
diff --git a/configure b/configure
index a2d2e753096..f3bd771691f 100755
--- a/configure
+++ b/configure
@@ -4085,9 +4085,7 @@ if test "$prefix" = /usr; then
 	test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc"
 fi
 
-ac_config_files="$ac_config_files mkdeb.sh"
-
-ac_config_files="$ac_config_files Makefile config.mk config.sh src/bash_completion/Makefile src/common.mk src/fbuilder/Makefile src/fcopy/Makefile src/fids/Makefile src/firecfg/Makefile src/firejail/Makefile src/firemon/Makefile src/fldd/Makefile src/fnet/Makefile src/fnetfilter/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile src/fnettrace/Makefile src/fsec-optimize/Makefile src/fsec-print/Makefile src/fseccomp/Makefile src/ftee/Makefile src/fzenity/Makefile src/jailcheck/Makefile src/lib/Makefile src/libpostexecseccomp/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/man/Makefile src/profstats/Makefile src/zsh_completion/Makefile test/Makefile"
+ac_config_files="$ac_config_files config.mk config.sh"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4795,38 +4793,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;;
     "config.sh") CONFIG_FILES="$CONFIG_FILES config.sh" ;;
-    "src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;;
-    "src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;;
-    "src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;;
-    "src/fcopy/Makefile") CONFIG_FILES="$CONFIG_FILES src/fcopy/Makefile" ;;
-    "src/fids/Makefile") CONFIG_FILES="$CONFIG_FILES src/fids/Makefile" ;;
-    "src/firecfg/Makefile") CONFIG_FILES="$CONFIG_FILES src/firecfg/Makefile" ;;
-    "src/firejail/Makefile") CONFIG_FILES="$CONFIG_FILES src/firejail/Makefile" ;;
-    "src/firemon/Makefile") CONFIG_FILES="$CONFIG_FILES src/firemon/Makefile" ;;
-    "src/fldd/Makefile") CONFIG_FILES="$CONFIG_FILES src/fldd/Makefile" ;;
-    "src/fnet/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnet/Makefile" ;;
-    "src/fnetfilter/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnetfilter/Makefile" ;;
-    "src/fnettrace-dns/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace-dns/Makefile" ;;
-    "src/fnettrace-sni/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace-sni/Makefile" ;;
-    "src/fnettrace/Makefile") CONFIG_FILES="$CONFIG_FILES src/fnettrace/Makefile" ;;
-    "src/fsec-optimize/Makefile") CONFIG_FILES="$CONFIG_FILES src/fsec-optimize/Makefile" ;;
-    "src/fsec-print/Makefile") CONFIG_FILES="$CONFIG_FILES src/fsec-print/Makefile" ;;
-    "src/fseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/fseccomp/Makefile" ;;
-    "src/ftee/Makefile") CONFIG_FILES="$CONFIG_FILES src/ftee/Makefile" ;;
-    "src/fzenity/Makefile") CONFIG_FILES="$CONFIG_FILES src/fzenity/Makefile" ;;
-    "src/jailcheck/Makefile") CONFIG_FILES="$CONFIG_FILES src/jailcheck/Makefile" ;;
-    "src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
-    "src/libpostexecseccomp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libpostexecseccomp/Makefile" ;;
-    "src/libtrace/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtrace/Makefile" ;;
-    "src/libtracelog/Makefile") CONFIG_FILES="$CONFIG_FILES src/libtracelog/Makefile" ;;
-    "src/man/Makefile") CONFIG_FILES="$CONFIG_FILES src/man/Makefile" ;;
-    "src/profstats/Makefile") CONFIG_FILES="$CONFIG_FILES src/profstats/Makefile" ;;
-    "src/zsh_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/zsh_completion/Makefile" ;;
-    "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -5240,11 +5208,6 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
 
   esac
 
-
-  case $ac_file$ac_mode in
-    "mkdeb.sh":F) chmod +x mkdeb.sh ;;
-
-  esac
 done # for ac_tag
 
 
diff --git a/configure.ac b/configure.ac
index 53de0eb1dbc..8a488ff4301 100644
--- a/configure.ac
+++ b/configure.ac
@@ -282,40 +282,7 @@ if test "$prefix" = /usr; then
 	test "$sysconfdir" = '${prefix}/etc' && sysconfdir="/etc"
 fi
 
-AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh])
-AC_CONFIG_FILES([
-Makefile
-config.mk
-config.sh
-src/bash_completion/Makefile
-src/common.mk
-src/fbuilder/Makefile
-src/fcopy/Makefile
-src/fids/Makefile
-src/firecfg/Makefile
-src/firejail/Makefile
-src/firemon/Makefile
-src/fldd/Makefile
-src/fnet/Makefile
-src/fnetfilter/Makefile
-src/fnettrace-dns/Makefile
-src/fnettrace-sni/Makefile
-src/fnettrace/Makefile
-src/fsec-optimize/Makefile
-src/fsec-print/Makefile
-src/fseccomp/Makefile
-src/ftee/Makefile
-src/fzenity/Makefile
-src/jailcheck/Makefile
-src/lib/Makefile
-src/libpostexecseccomp/Makefile
-src/libtrace/Makefile
-src/libtracelog/Makefile
-src/man/Makefile
-src/profstats/Makefile
-src/zsh_completion/Makefile
-test/Makefile
-])
+AC_CONFIG_FILES([config.mk config.sh])
 AC_OUTPUT
 
 cat <<EOF
diff --git a/contrib/fj-mkdeb.py b/contrib/fj-mkdeb.py
index 854e8d1a834..b215b157b08 100755
--- a/contrib/fj-mkdeb.py
+++ b/contrib/fj-mkdeb.py
@@ -12,7 +12,7 @@
 def run(srcdir, args):
     if srcdir: os.chdir(srcdir)
 
-    if not (os.path.isfile('./mkdeb.sh.in')):
+    if not (os.path.isfile('./mkdeb.sh')):
         print('Error: Not a firejail source tree?  Exiting.')
         return 1
 
@@ -22,7 +22,7 @@ def run(srcdir, args):
             # prefix should ALWAYS be /usr here.  Discard user-set values
             args.remove(a)
 
-    # Run configure to generate mkdeb.sh.
+    # Run configure to generate config.sh.
     first_config = subprocess.call(['./configure', '--prefix=/usr'] + args)
     if first_config != 0:
         return first_config
@@ -62,9 +62,9 @@ def run(srcdir, args):
         if not (srcdir):
             # srcdir not manually specified, try to auto-detect
             srcdir = os.path.dirname(os.path.abspath(sys.argv[0] + '/..'))
-            if not (os.path.isfile(srcdir + '/mkdeb.sh.in')):
+            if not (os.path.isfile(srcdir + '/mkdeb.sh')):
                 # Script is probably installed.  Check the cwd.
-                if os.path.isfile('./mkdeb.sh.in'):
+                if os.path.isfile('./mkdeb.sh'):
                     srcdir = None
                 else:
                     print(
diff --git a/mkdeb.sh.in b/mkdeb.sh
similarity index 100%
rename from mkdeb.sh.in
rename to mkdeb.sh
diff --git a/src/bash_completion/Makefile.in b/src/bash_completion/Makefile
similarity index 95%
rename from src/bash_completion/Makefile.in
rename to src/bash_completion/Makefile
index 69f35e7aeb7..9157c92253c 100644
--- a/src/bash_completion/Makefile.in
+++ b/src/bash_completion/Makefile
@@ -15,4 +15,3 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/common.mk.in b/src/common.mk
similarity index 100%
rename from src/common.mk.in
rename to src/common.mk
diff --git a/src/fbuilder/Makefile.in b/src/fbuilder/Makefile
similarity index 95%
rename from src/fbuilder/Makefile.in
rename to src/fbuilder/Makefile
index 060f974935a..b769deac962 100644
--- a/src/fbuilder/Makefile.in
+++ b/src/fbuilder/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fcopy/Makefile.in b/src/fcopy/Makefile
similarity index 95%
rename from src/fcopy/Makefile.in
rename to src/fcopy/Makefile
index a2a4172a9b4..8016158780a 100644
--- a/src/fcopy/Makefile.in
+++ b/src/fcopy/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fids/Makefile.in b/src/fids/Makefile
similarity index 96%
rename from src/fids/Makefile.in
rename to src/fids/Makefile
index 8aac554193a..eed6e44ea7f 100644
--- a/src/fids/Makefile.in
+++ b/src/fids/Makefile
@@ -16,4 +16,3 @@ clean:; rm -fr *.o fids *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/firecfg/Makefile.in b/src/firecfg/Makefile
similarity index 96%
rename from src/firecfg/Makefile.in
rename to src/firecfg/Makefile
index d112cc40abc..c06bb5338a7 100644
--- a/src/firecfg/Makefile.in
+++ b/src/firecfg/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile
similarity index 97%
rename from src/firejail/Makefile.in
rename to src/firejail/Makefile
index 0dec3da9864..ffe978957cf 100644
--- a/src/firejail/Makefile.in
+++ b/src/firejail/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile
similarity index 96%
rename from src/firemon/Makefile.in
rename to src/firemon/Makefile
index 6ac0cfff153..45203673b56 100644
--- a/src/firemon/Makefile.in
+++ b/src/firemon/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fldd/Makefile.in b/src/fldd/Makefile
similarity index 96%
rename from src/fldd/Makefile.in
rename to src/fldd/Makefile
index f3842cbeeb7..fdaa202fda4 100644
--- a/src/fldd/Makefile.in
+++ b/src/fldd/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile
similarity index 96%
rename from src/fnet/Makefile.in
rename to src/fnet/Makefile
index 3d70e50bf9b..2642fea381e 100644
--- a/src/fnet/Makefile.in
+++ b/src/fnet/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fnetfilter/Makefile.in b/src/fnetfilter/Makefile
similarity index 96%
rename from src/fnetfilter/Makefile.in
rename to src/fnetfilter/Makefile
index 32b4bbadac7..e0738281ac6 100644
--- a/src/fnetfilter/Makefile.in
+++ b/src/fnetfilter/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fnettrace-dns/Makefile.in b/src/fnettrace-dns/Makefile
similarity index 95%
rename from src/fnettrace-dns/Makefile.in
rename to src/fnettrace-dns/Makefile
index 7cafe6907cc..9946f545dc0 100644
--- a/src/fnettrace-dns/Makefile.in
+++ b/src/fnettrace-dns/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace-dns *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fnettrace-sni/Makefile.in b/src/fnettrace-sni/Makefile
similarity index 95%
rename from src/fnettrace-sni/Makefile.in
rename to src/fnettrace-sni/Makefile
index 9349d06f89c..556727831d3 100644
--- a/src/fnettrace-sni/Makefile.in
+++ b/src/fnettrace-sni/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace-sni *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fnettrace/Makefile.in b/src/fnettrace/Makefile
similarity index 95%
rename from src/fnettrace/Makefile.in
rename to src/fnettrace/Makefile
index a7b93194a5b..406d095ff93 100644
--- a/src/fnettrace/Makefile.in
+++ b/src/fnettrace/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fnettrace *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fsec-optimize/Makefile.in b/src/fsec-optimize/Makefile
similarity index 96%
rename from src/fsec-optimize/Makefile.in
rename to src/fsec-optimize/Makefile
index cfd876953ce..1ccc2fa8f80 100644
--- a/src/fsec-optimize/Makefile.in
+++ b/src/fsec-optimize/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fsec-print/Makefile.in b/src/fsec-print/Makefile
similarity index 96%
rename from src/fsec-print/Makefile.in
rename to src/fsec-print/Makefile
index d07c42405c9..b5ba6f1609e 100644
--- a/src/fsec-print/Makefile.in
+++ b/src/fsec-print/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fseccomp/Makefile.in b/src/fseccomp/Makefile
similarity index 96%
rename from src/fseccomp/Makefile.in
rename to src/fseccomp/Makefile
index 140a56ab068..527ec0a68e8 100644
--- a/src/fseccomp/Makefile.in
+++ b/src/fseccomp/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile
similarity index 95%
rename from src/ftee/Makefile.in
rename to src/ftee/Makefile
index f9ad78de245..00c1a2662df 100644
--- a/src/ftee/Makefile.in
+++ b/src/ftee/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o ftee *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/fzenity/Makefile.in b/src/fzenity/Makefile
similarity index 95%
rename from src/fzenity/Makefile.in
rename to src/fzenity/Makefile
index 6b7ce087472..169b78f091f 100644
--- a/src/fzenity/Makefile.in
+++ b/src/fzenity/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o fzenity *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/jailcheck/Makefile.in b/src/jailcheck/Makefile
similarity index 95%
rename from src/jailcheck/Makefile.in
rename to src/jailcheck/Makefile
index cf619ad1eff..62e82c9b342 100644
--- a/src/jailcheck/Makefile.in
+++ b/src/jailcheck/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/lib/Makefile.in b/src/lib/Makefile
similarity index 93%
rename from src/lib/Makefile.in
rename to src/lib/Makefile
index 330a47892f0..bac2d4e9397 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile
@@ -12,4 +12,3 @@ clean:; rm -fr $(OBJS) *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/libpostexecseccomp/Makefile.in b/src/libpostexecseccomp/Makefile
similarity index 97%
rename from src/libpostexecseccomp/Makefile.in
rename to src/libpostexecseccomp/Makefile
index 6f354757c25..2f108d8b9e0 100644
--- a/src/libpostexecseccomp/Makefile.in
+++ b/src/libpostexecseccomp/Makefile
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libpostexecseccomp.so *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile
similarity index 97%
rename from src/libtrace/Makefile.in
rename to src/libtrace/Makefile
index ced03686546..11c75136dc1 100644
--- a/src/libtrace/Makefile.in
+++ b/src/libtrace/Makefile
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libtrace.so *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/libtracelog/Makefile.in b/src/libtracelog/Makefile
similarity index 97%
rename from src/libtracelog/Makefile.in
rename to src/libtracelog/Makefile
index 52d4bcb0820..d09a8aa1cca 100644
--- a/src/libtracelog/Makefile.in
+++ b/src/libtracelog/Makefile
@@ -22,4 +22,3 @@ clean:; rm -fr $(OBJS) libtracelog.so *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/man/Makefile.in b/src/man/Makefile
similarity index 94%
rename from src/man/Makefile.in
rename to src/man/Makefile
index a63f9d28ef0..c83a4b7ebd4 100644
--- a/src/man/Makefile.in
+++ b/src/man/Makefile
@@ -12,4 +12,3 @@ clean:; rm -fr *.man
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/profstats/Makefile.in b/src/profstats/Makefile
similarity index 95%
rename from src/profstats/Makefile.in
rename to src/profstats/Makefile
index 394f30fdacb..0e3b101efbc 100644
--- a/src/profstats/Makefile.in
+++ b/src/profstats/Makefile
@@ -15,4 +15,3 @@ clean:; rm -fr *.o profstats *.gcov *.gcda *.gcno *.plist
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/src/zsh_completion/Makefile.in b/src/zsh_completion/Makefile
similarity index 94%
rename from src/zsh_completion/Makefile.in
rename to src/zsh_completion/Makefile
index fceab1d0035..303057b0b46 100644
--- a/src/zsh_completion/Makefile.in
+++ b/src/zsh_completion/Makefile
@@ -15,4 +15,3 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -fr Makefile
diff --git a/test/Makefile.in b/test/Makefile
similarity index 94%
rename from test/Makefile.in
rename to test/Makefile
index 264314a3b38..2f3a97d73fd 100644
--- a/test/Makefile.in
+++ b/test/Makefile
@@ -11,4 +11,3 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -f Makefile