diff --git a/configure.ac b/configure.ac
index 1c3f03b0..66722041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,6 +248,7 @@ AC_OUTPUT(
     src/Makefile
     src/gprs/Makefile
     src/gbproxy/Makefile
+    src/gtphub/Makefile
     tests/Makefile
     tests/atlocal
     tests/gprs/Makefile
diff --git a/debian/copyright b/debian/copyright
index 695d768b..5d883b9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -104,9 +104,9 @@ Files:     include/osmocom/sgsn/a_reset.h
            src/gprs/gprs_sndcp_vty.c
            src/gprs/gprs_sndcp_xid.c
            src/gprs/gprs_subscriber.c
-           src/gprs/gtphub.c
-           src/gprs/gtphub_main.c
-           src/gprs/gtphub_vty.c
+           src/gtphub/gtphub.c
+           src/gtphub/gtphub_main.c
+           src/gtphub/gtphub_vty.c
            src/gprs/sgsn_auth.c
            src/gprs/sgsn_cdr.c
            src/gprs/sgsn_ctrl.c
@@ -140,8 +140,8 @@ License:   AGPL-3.0+
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Files:     src/gprs/gtphub_ares.c
-           src/gprs/gtphub_sock.c
+Files:     src/gtphub/gtphub_ares.c
+           src/gtphub/gtphub_sock.c
            tests/gbproxy/gbproxy_test.c
 Copyright: 2013 Jacob Erlbeck <jerlbeck@sysmocom.de>
            2013 sysmocom s.f.m.c. GmbH
diff --git a/doc/examples/osmo-gtphub/gtphub-example.txt b/doc/examples/osmo-gtphub/gtphub-example.txt
index 9c65f925..17f6914d 100644
--- a/doc/examples/osmo-gtphub/gtphub-example.txt
+++ b/doc/examples/osmo-gtphub/gtphub-example.txt
@@ -59,7 +59,7 @@ The LD_LIBRARY_PATH below may be needed if OpenGGSN installed to /usr/local.
 2. GTPHub:
 
     cd <your-test-dir>
-    path/to/openbsc/openbsc/src/gprs/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level
+    path/to/openbsc/openbsc/src/gtphub/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level
 
 3. SGSN tests:
 
diff --git a/osmoappdesc.py b/osmoappdesc.py
index 1c47aee6..9c3fd5d9 100644
--- a/osmoappdesc.py
+++ b/osmoappdesc.py
@@ -25,7 +25,7 @@ app_configs = {
 
 apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),
         (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"),
-        (4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub")
+        (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub")
         ]
 
 vty_command = ["./src/gprs/osmo-sgsn", "-c",
diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am
index 523df61d..fea01e0d 100644
--- a/tests/gtphub/Makefile.am
+++ b/tests/gtphub/Makefile.am
@@ -31,7 +31,7 @@ gtphub_test_LDFLAGS = \
 	$(NULL)
 
 gtphub_test_LDADD = \
-	$(top_builddir)/src/gprs/gtphub.o \
+	$(top_builddir)/src/gtphub/gtphub.o \
 	$(top_builddir)/src/gprs/gprs_utils.o \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOGSM_LIBS) \