diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index 57994f2f9763df8dd576afe57f5a78c0118351a1..5a4866a7b5b6adfcd90909bfc170a2b6b623ac5a 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -9,7 +9,10 @@ subdirs:
 	for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done
 
 dummy:	$(DUMMY) linker_options modlist_headers modlist_segment module.so
-	tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so
+	tmp="$(INSTALL_NAME)" ; \
+	if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ;\
+	$(INSTALL) module.so $(TMP_LIBDIR)/modules/$$tmp.so ;\
+	if [ -f $(SRCDIR)/module.pmod.in ]; then sed -e "s/@module@/\"$$tmp\"/" <$(SRCDIR)/module.pmod.in >$(TMP_LIBDIR)/modules/$$tmp.pmod ; fi
 
 linker_options: Makefile
 	echo "$(LINKER_OPTIONS)" >linker_options
@@ -57,3 +60,4 @@ gdb_verify: module_testsuite
 
 install: $(MODULE_INSTALL)
 	$(INSTALL) module.so @prefix@/lib/pike/modules/$(MODNAME).so
+
diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in
index b6e0583c1e26856dde46cb3eb5ea80a0e143d1f1..a2c4f1629eb462e5749a915294ad502d27f45d78 100644
--- a/src/modules/static_module_makefile.in
+++ b/src/modules/static_module_makefile.in
@@ -9,7 +9,9 @@ subdirs:
 	for a in '' $(MODULE_SUBDIRS) ; do if test ! -z "$$a"; then echo making $$a ; ( cd $$a ; $(MAKE) $(MAKE_FLAGS) ) ; fi ; done
 
 dummy:	linker_options modlist_headers modlist_segment module.pmod module.a
-	tmp="$(INSTALL_NAME)" ; if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ; $(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod
+	tmp="$(INSTALL_NAME)" ;\
+	if test x$$tmp = x ; then tmp="$(MODNAME)"; fi ;\
+	$(INSTALL) module.pmod $(TMP_LIBDIR)/modules/$$tmp.pmod
 
 linker_options: Makefile $(MODULE_ARCHIVES)
 	echo >linker_options modules/$(MODNAME)/module.a $(MODULE_LDFLAGS)
@@ -27,7 +29,11 @@ Makefile: $(SRCDIR)/Makefile.in $(SRCDIR)/dependencies
 	@exit 1
 
 module.pmod: Makefile
-	echo >module.pmod "inherit _static_modules.$(MODNAME);"
+	if [ -f $(SRCDIR)/module.pmod.in ]; then \
+	   sed -e "s/@module@/_static_modules.$(MODNAME)/" <$(SRCDIR)/module.pmod.in >module.pmod ;\
+	else \
+	  echo >module.pmod "inherit _static_modules.$(MODNAME);" ;\
+	fi
 
 module.a: $(OBJS)
 	-rm -f module.a