diff --git a/bin/Makefile.am b/bin/Makefile.am
index 4fe71658a7bb74e226b4207ba07069cd52d0f645..4dae5aa3989493fcc69f9430b5bbea5aab987fbc 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,17 +1,17 @@
-bin_SCRIPTS = account-manager-client.pl
+bin_SCRIPTS = account-manager.pl
 
-www_SCRIPTS = account-manager-web.pl
+www_SCRIPTS = account-manager.cgi
 
-EXTRA_DIST = account-manager-client.pl.in account-manager-web.pl.in
+EXTRA_DIST = account-manager.pl.in account-manager.cgi.in
 
-account-manager-client.pl: Makefile account-manager-client.pl.in
+account-manager.pl: Makefile account-manager.pl.in
 	sed \
 		-e 's|[@]modulesdir[@]|$(modulesdir)|' \
 		-e 's|[@]sysconfdir[@]|$(sysconfdir)|' \
 		< $(srcdir)/$@.in > $@
 	chmod +x $@
 
-account-manager-web.pl: Makefile account-manager-web.pl.in
+account-manager.cgi: Makefile account-manager.cgi.in
 	sed \
 		-e 's|[@]modulesdir[@]|$(modulesdir)|' \
 		-e 's|[@]sysconfdir[@]|$(sysconfdir)|' \
diff --git a/bin/account-manager-web.pl.in b/bin/account-manager.cgi.in
similarity index 100%
rename from bin/account-manager-web.pl.in
rename to bin/account-manager.cgi.in
diff --git a/bin/account-manager-client.pl.in b/bin/account-manager.pl.in
similarity index 100%
rename from bin/account-manager-client.pl.in
rename to bin/account-manager.pl.in