diff --git a/modules/Makefile.in b/modules/Makefile.in
index 56ffb387..8479b5d7 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -31,15 +31,13 @@ ifneq "$(LIBZNC)" ""
 LDFLAGS += -L.. -lznc -Wl,-rpath,$(LIBZNCDIR)
 endif
 
-FILES    := $(wildcard $(srcdir)/*.cpp)
+FILES    := $(notdir $(wildcard $(srcdir)/*.cpp))
 # If extra is enabled
 ifeq "@EXTRA@" "yes"
-FILES    += $(wildcard $(srcdir)/extra/*.cpp)
+FILES    += $(addprefix extra/, $(notdir $(wildcard $(srcdir)/extra/*.cpp)))
 endif
 
 FILES    := $(basename $(FILES))
-# Strip away the srcdir, we want them to be created in the current dir
-FILES    := $(shell echo $(FILES) | sed -e "s: $(srcdir)/: :g")
 
 ifeq "@NOSSL@" "1"
 FILES    := $(foreach file, $(FILES), \
@@ -101,9 +99,8 @@ clean:
 
 %.so: %.cpp Makefile
 	@mkdir -p .depend
-	@mkdir -p .depend/extra
 	@mkdir -p extra
-	$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(shell echo '$(basename $@)' | sed -e 's:extra/::')FLAGS) -MMD -MF .depend/$@.dep
+	$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $($(notdir $(basename $@))FLAGS) -MMD -MF .depend/$(notdir $@).dep
 
 modperl_install: create_install_dir
 	for i in $(srcdir)/*.pm; do \