diff --git a/contrib/libgtpnl.spec.in b/contrib/libgtpnl.spec.in
index 8453612..0399d5d 100644
--- a/contrib/libgtpnl.spec.in
+++ b/contrib/libgtpnl.spec.in
@@ -51,6 +51,18 @@ Linux kernel into a C API.
 This subpackage contains libraries and header files for developing
 applications that want to make use of libgtpnl.
 
+%package tools
+Summary:        Libgtpnl user tools
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
+Group:          Applications/System
+Requires:       libgtpnl0 = %{version}
+
+%description tools
+libgtpnl wraps the genetlink-based GPRS tunnel configuration of the
+Linux kernel into a C API.
+
+This subpackage contains sample tools to manage gtp interfaces and tunnels.
+
 %prep
 %setup -q
 
@@ -79,4 +91,8 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 %{_libdir}/libgtpnl.so
 %{_libdir}/pkgconfig/*.pc
 
+%files tools
+%{_bindir}/gtp-link
+%{_bindir}/gtp-tunnel
+
 %changelog
diff --git a/debian/control b/debian/control
index 3128f3e..5c8ed03 100644
--- a/debian/control
+++ b/debian/control
@@ -43,3 +43,12 @@ Priority: extra
 Depends: libgtpnl0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Debug symbols for Linux kernel GTP-U netlink library
+
+Package: libgtpnl-tools
+Architecture: any
+Multi-Arch: same
+Section: net
+Priority: extra
+Depends: libgtpnl0 (= ${binary:Version}),
+         ${misc:Depends}
+Description: Tools to manage gtp interfaces and tunnels.
diff --git a/debian/libgtpnl-tools.install b/debian/libgtpnl-tools.install
new file mode 100644
index 0000000..49983e4
--- /dev/null
+++ b/debian/libgtpnl-tools.install
@@ -0,0 +1,2 @@
+/usr/bin/gtp-link
+/usr/bin/gtp-tunnel
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ec2eb66..7beae57 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Make_global.am
 
-noinst_PROGRAMS = gtp-link		\
+bin_PROGRAMS = gtp-link		\
 		  gtp-tunnel
 
 gtp_link_SOURCES = gtp-link.c