diff --git a/modules/Makefile.in b/modules/Makefile.in
index c959794e..ffa8953a 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -63,7 +63,7 @@ endif
 
 include $(srcdir)/modperl/Makefile.inc
 include $(srcdir)/modpython/Makefile.inc
-include $(srcdir)/Makefile.modtcl
+include $(srcdir)/modtcl/Makefile.inc
 
 FILES    := $(basename $(FILES))
 
diff --git a/modules/extra/modtcl.cpp b/modules/modtcl.cpp
similarity index 100%
rename from modules/extra/modtcl.cpp
rename to modules/modtcl.cpp
diff --git a/modules/Makefile.modtcl b/modules/modtcl/Makefile.inc
similarity index 53%
rename from modules/Makefile.modtcl
rename to modules/modtcl/Makefile.inc
index 3e1e1833..930c39a2 100644
--- a/modules/Makefile.modtcl
+++ b/modules/modtcl/Makefile.inc
@@ -1,5 +1,5 @@
 ifeq "$(TCL_FLAGS)" ""
-FILES       := $(shell echo $(FILES) | sed -e "s:extra/modtcl::")
+FILES       := $(shell echo $(FILES) | sed -e "s:modtcl::")
 else
 TCLHOOK     := modtcl_install
 endif
@@ -11,4 +11,4 @@ install: $(TCLHOOK)
 
 modtcl_install:
 	mkdir -p $(DESTDIR)$(DATADIR)/modtcl/
-	$(INSTALL_DATA) $(srcdir)/extra/modtcl.tcl $(srcdir)/extra/binds.tcl $(DESTDIR)$(DATADIR)/modtcl/
+	$(INSTALL_DATA) $(srcdir)/modtcl/modtcl.tcl $(srcdir)/modtcl/binds.tcl $(DESTDIR)$(DATADIR)/modtcl/
diff --git a/modules/extra/binds.tcl b/modules/modtcl/binds.tcl
similarity index 100%
rename from modules/extra/binds.tcl
rename to modules/modtcl/binds.tcl
diff --git a/modules/extra/modtcl.tcl b/modules/modtcl/modtcl.tcl
similarity index 100%
rename from modules/extra/modtcl.tcl
rename to modules/modtcl/modtcl.tcl