diff --git a/Makefile.am b/Makefile.am
index 5a157ce7d..9fdb4abb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
 SUBDIRS = include src tests utils
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc
+pkgconfig_DATA = libosmocore.pc libosmocodec.pc libosmovty.pc libosmogsm.pc \
+		 libosmogb.pc
 
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
diff --git a/configure.ac b/configure.ac
index 977eef9df..484a7ddfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,18 +146,22 @@ AC_OUTPUT(
 	libosmocodec.pc
 	libosmovty.pc
 	libosmogsm.pc
+	libosmogb.pc
 	include/osmocom/Makefile
 	include/osmocom/vty/Makefile
 	include/osmocom/codec/Makefile
 	include/osmocom/crypt/Makefile
 	include/osmocom/gsm/Makefile
 	include/osmocom/gsm/protocol/Makefile
+	include/osmocom/gprs/Makefile
+	include/osmocom/gprs/protocol/Makefile
 	include/osmocom/core/Makefile
 	include/Makefile
 	src/Makefile
 	src/vty/Makefile
 	src/codec/Makefile
 	src/gsm/Makefile
+	src/gb/Makefile
 	tests/Makefile
 	tests/timer/Makefile
 	tests/sms/Makefile
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
index 21f4f2d02..bd3b89bd9 100644
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,5 +1,5 @@
 if ENABLE_VTY
-SUBDIRS = vty codec crypt gsm core
+SUBDIRS = vty codec crypt gsm gprs core
 else
-SUBDIRS = codec crypt gsm core
+SUBDIRS = codec crypt gsm gprs core
 endif
diff --git a/openbsc/include/osmocom/gprs/Makefile.am b/include/osmocom/gprs/Makefile.am
similarity index 100%
rename from openbsc/include/osmocom/gprs/Makefile.am
rename to include/osmocom/gprs/Makefile.am
diff --git a/openbsc/include/osmocom/gprs/gprs_bssgp.h b/include/osmocom/gprs/gprs_bssgp.h
similarity index 100%
rename from openbsc/include/osmocom/gprs/gprs_bssgp.h
rename to include/osmocom/gprs/gprs_bssgp.h
diff --git a/openbsc/include/osmocom/gprs/gprs_msgb.h b/include/osmocom/gprs/gprs_msgb.h
similarity index 100%
rename from openbsc/include/osmocom/gprs/gprs_msgb.h
rename to include/osmocom/gprs/gprs_msgb.h
diff --git a/openbsc/include/osmocom/gprs/gprs_ns.h b/include/osmocom/gprs/gprs_ns.h
similarity index 100%
rename from openbsc/include/osmocom/gprs/gprs_ns.h
rename to include/osmocom/gprs/gprs_ns.h
diff --git a/openbsc/include/osmocom/gprs/gprs_ns_frgre.h b/include/osmocom/gprs/gprs_ns_frgre.h
similarity index 100%
rename from openbsc/include/osmocom/gprs/gprs_ns_frgre.h
rename to include/osmocom/gprs/gprs_ns_frgre.h
diff --git a/openbsc/include/osmocom/gprs/protocol/Makefile.am b/include/osmocom/gprs/protocol/Makefile.am
similarity index 100%
rename from openbsc/include/osmocom/gprs/protocol/Makefile.am
rename to include/osmocom/gprs/protocol/Makefile.am
diff --git a/openbsc/include/osmocom/gprs/protocol/gsm_08_16.h b/include/osmocom/gprs/protocol/gsm_08_16.h
similarity index 100%
rename from openbsc/include/osmocom/gprs/protocol/gsm_08_16.h
rename to include/osmocom/gprs/protocol/gsm_08_16.h
diff --git a/openbsc/include/osmocom/gprs/protocol/gsm_08_18.h b/include/osmocom/gprs/protocol/gsm_08_18.h
similarity index 100%
rename from openbsc/include/osmocom/gprs/protocol/gsm_08_18.h
rename to include/osmocom/gprs/protocol/gsm_08_18.h
diff --git a/libosmogb.pc.in b/libosmogb.pc.in
new file mode 100644
index 000000000..cbfa631b6
--- /dev/null
+++ b/libosmogb.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Osmocom GPRS Gb Library
+Description: Osmocom GPRS Gb Interface (NS/BSSGP) Library
+Version: @VERSION@
+Libs: -L${libdir} -losmogb
+Cflags: -I${includedir}/
+
diff --git a/openbsc/src/libgb/Makefile.am b/openbsc/src/libgb/Makefile.am
deleted file mode 100644
index eafbc3437..000000000
--- a/openbsc/src/libgb/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) \
-	$(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
-
-noinst_LIBRARIES = libgb.a
-
-libgb_a_SOURCES = gprs_ns.c gprs_ns_frgre.c gprs_ns_vty.c \
-		  gprs_bssgp.c gprs_bssgp_util.c gprs_bssgp_vty.c \
-		  gprs_bssgp_bss.c common_vty.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 079d0b4cc..b79c8b706 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=. vty codec gsm
+SUBDIRS=. vty codec gsm gb
 
 # This is _NOT_ the library release version, it's an API version.
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
diff --git a/openbsc/src/libgb/common_vty.c b/src/gb/common_vty.c
similarity index 100%
rename from openbsc/src/libgb/common_vty.c
rename to src/gb/common_vty.c
diff --git a/openbsc/src/libgb/common_vty.h b/src/gb/common_vty.h
similarity index 100%
rename from openbsc/src/libgb/common_vty.h
rename to src/gb/common_vty.h
diff --git a/openbsc/src/libgb/gprs_bssgp.c b/src/gb/gprs_bssgp.c
similarity index 100%
rename from openbsc/src/libgb/gprs_bssgp.c
rename to src/gb/gprs_bssgp.c
diff --git a/openbsc/src/libgb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c
similarity index 100%
rename from openbsc/src/libgb/gprs_bssgp_bss.c
rename to src/gb/gprs_bssgp_bss.c
diff --git a/openbsc/src/libgb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c
similarity index 100%
rename from openbsc/src/libgb/gprs_bssgp_util.c
rename to src/gb/gprs_bssgp_util.c
diff --git a/openbsc/src/libgb/gprs_bssgp_vty.c b/src/gb/gprs_bssgp_vty.c
similarity index 100%
rename from openbsc/src/libgb/gprs_bssgp_vty.c
rename to src/gb/gprs_bssgp_vty.c
diff --git a/openbsc/src/libgb/gprs_ns.c b/src/gb/gprs_ns.c
similarity index 100%
rename from openbsc/src/libgb/gprs_ns.c
rename to src/gb/gprs_ns.c
diff --git a/openbsc/src/libgb/gprs_ns_frgre.c b/src/gb/gprs_ns_frgre.c
similarity index 100%
rename from openbsc/src/libgb/gprs_ns_frgre.c
rename to src/gb/gprs_ns_frgre.c
diff --git a/openbsc/src/libgb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c
similarity index 100%
rename from openbsc/src/libgb/gprs_ns_vty.c
rename to src/gb/gprs_ns_vty.c
diff --git a/openbsc/src/libgb/libosmo-gb.map b/src/gb/libosmogb.map
similarity index 90%
rename from openbsc/src/libgb/libosmo-gb.map
rename to src/gb/libosmogb.map
index 83a830261..19161790d 100644
--- a/openbsc/src/libgb/libosmo-gb.map
+++ b/src/gb/libosmogb.map
@@ -23,12 +23,12 @@ bssgp_tx_suspend;
 bssgp_tx_suspend_ack;
 bssgp_tx_suspend_nack;
 bssgp_tx_ul_ud;
-bssgp_rcvmsg
-bssgp_rx_paging
-bssgp_set_log_ss
-bssgp_tx_dl_ud
-bssgp_tx_paging
-bssgp_vty_init
+bssgp_rcvmsg;
+bssgp_rx_paging;
+bssgp_set_log_ss;
+bssgp_tx_dl_ud;
+bssgp_tx_paging;
+bssgp_vty_init;
 
 gprs_ns_cause_str;
 gprs_ns_destroy;