diff --git a/modules/Makefile.in b/modules/Makefile.in
index 54d4c6e1..19c6c1f8 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -58,12 +58,12 @@ FILES    := $(shell echo $(FILES) | sed -e "s/modperl//")
 endif
 
 ifeq "@SASL@" ""
-FILES    := $(shell echo $(FILES) | sed -e "s/saslauth//")
+FILES    := $(shell echo $(FILES) | sed -e "s:extra/saslauth::")
 endif
 saslauthFLAGS := -lsasl2
 
 ifeq "$(TCL_FLAGS)" ""
-FILES       := $(shell echo $(FILES) | sed -e "s:extra/modtcl::g")
+FILES       := $(shell echo $(FILES) | sed -e "s:extra/modtcl::")
 else
 TCLHOOK     := modtcl_install
 endif
diff --git a/modules/saslauth.cpp b/modules/extra/saslauth.cpp
similarity index 100%
rename from modules/saslauth.cpp
rename to modules/extra/saslauth.cpp