diff --git a/net/mutella/Makefile b/net/mutella/Makefile
index afe95b6ec..ded1b8bad 100644
--- a/net/mutella/Makefile
+++ b/net/mutella/Makefile
@@ -43,12 +43,6 @@ endef
 CONFIGURE_VARS += \
 	CXXFLAGS="$$$$CXXFLAGS -fno-rtti"  \
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(SED) 's,-I$$$$(includedir),,g' $(PKG_BUILD_DIR)/{mutella,util}/Makefile.in
-	$(SED) 's,-L$$$$(libdir),,g' $(PKG_BUILD_DIR)/{mutella,util}/Makefile.in
-endef
-
 define Package/mutella/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutella{,_sio} $(1)/usr/bin/
diff --git a/net/mutella/patches/004-no-host-paths.patch b/net/mutella/patches/004-no-host-paths.patch
new file mode 100644
index 000000000..c32e52434
--- /dev/null
+++ b/net/mutella/patches/004-no-host-paths.patch
@@ -0,0 +1,58 @@
+--- a/mutella/Makefile.am
++++ b/mutella/Makefile.am
+@@ -12,8 +12,8 @@ EXTRA_DIST = main.cpp common.cpp common.
+ ####### kdevelop will overwrite this part!!! (end)############
+ 
+ # set the include path found by configure
+-INCLUDES= $(all_includes) -I$(includedir)
++INCLUDES= $(all_includes)
+  
+ # the library search path.
+-mutella_LDFLAGS = $(all_libraries) -L$(libdir)
++mutella_LDFLAGS = $(all_libraries)
+                                                                                 
+--- a/mutella/Makefile.in
++++ b/mutella/Makefile.in
+@@ -221,10 +221,10 @@ EXTRA_DIST = main.cpp common.cpp common.
+ ####### kdevelop will overwrite this part!!! (end)############
+ 
+ # set the include path found by configure
+-INCLUDES = $(all_includes) -I$(includedir)
++INCLUDES = $(all_includes)
+ 
+ # the library search path.
+-mutella_LDFLAGS = $(all_libraries) -L$(libdir)
++mutella_LDFLAGS = $(all_libraries)
+ all: all-recursive
+ 
+ .SUFFIXES:
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -9,10 +9,10 @@ bin_PROGRAMS = mutella_sio
+ mutella_sio_SOURCES = sockio.c
+ 
+ # set the include path found by configure
+-INCLUDES= $(all_includes) -I$(includedir)
++INCLUDES= $(all_includes)
+ 
+ # the library search path.
+-mutella_sio_LDFLAGS = $(all_libraries) -L$(libdir)
++mutella_sio_LDFLAGS = $(all_libraries)
+ 
+ 
+ 
+--- a/util/Makefile.in
++++ b/util/Makefile.in
+@@ -166,10 +166,10 @@ EXTRA_DIST = sockio.c 
+ mutella_sio_SOURCES = sockio.c
+ 
+ # set the include path found by configure
+-INCLUDES = $(all_includes) -I$(includedir)
++INCLUDES = $(all_includes)
+ 
+ # the library search path.
+-mutella_sio_LDFLAGS = $(all_libraries) -L$(libdir)
++mutella_sio_LDFLAGS = $(all_libraries)
+ all: all-am
+ 
+ .SUFFIXES: