diff --git a/configure.in b/configure.in
index a5c5f6b..1154196 100644
--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,12 @@
 dnl Generate the output
 AM_CONFIG_HEADER(config.h)
 
+AC_ARG_ENABLE(talloc,
+	[  --disable-talloc Support message buffer ],
+	[enable_talloc=0], [enable_talloc=1])
+
+AM_CONDITIONAL(ENABLE_TALLOC, test "x$enable_talloc" = "x1")
+
 AC_OUTPUT(
 	libosmocore.pc
 	include/osmocore/Makefile
diff --git a/include/osmocore/Makefile.am b/include/osmocore/Makefile.am
index 9c4fc75..adcae53 100644
--- a/include/osmocore/Makefile.am
+++ b/include/osmocore/Makefile.am
@@ -1,7 +1,11 @@
-osmocore_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h \
+osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h \
 		   tlv.h bitvec.h comp128.h statistics.h gsm_utils.h utils.h \
 		   gsmtap.h write_queue.h rsl.h gsm48.h rxlev_stat.h
 
+if ENABLE_TALLOC
+osmocore_HEADERS += talloc.h
+endif
+
 osmocoredir = $(includedir)/osmocore
 
 SUBDIRS = protocol
diff --git a/src/Makefile.am b/src/Makefile.am
index 9942452..5122e73 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,10 @@
 
 lib_LTLIBRARIES = libosmocore.la
 
-libosmocore_la_SOURCES = msgb.c timer.c talloc.c select.c signal.c \
+libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c \
 			 tlv_parser.c bitvec.c comp128.c gsm_utils.c statistics.c \
 			 write_queue.c utils.c rsl.c gsm48.c rxlev_stat.c
+
+if ENABLE_TALLOC
+libosmocore_la_SOURCES += talloc.c
+endif