diff --git a/output/Makefile.am b/output/Makefile.am
index 112ebe72..b4b4e2c6 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -17,6 +17,8 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
+SUBDIRS = text
+
 # Local lib, this is NOT meant to be installed!
 noinst_LTLIBRARIES = libsigrokoutput.la
 
@@ -25,10 +27,6 @@ libsigrokoutput_la_SOURCES = \
 	output_vcd.c \
 	output_ols.c \
 	output_gnuplot.c \
-	text/text.c \
-	text/bits.c \
-	text/hex.c \
-	text/ascii.c \
 	output.c
 
 # Temporarily disabled: output_analog.c
@@ -36,3 +34,6 @@ libsigrokoutput_la_SOURCES = \
 libsigrokoutput_la_CFLAGS = \
 	-I$(top_srcdir)/libsigrok
 
+libsigrokoutput_la_LIBADD = \
+	text/libsigrokoutputtext.la
+
diff --git a/output/text/Makefile.am b/output/text/Makefile.am
new file mode 100644
index 00000000..5e0bffcf
--- /dev/null
+++ b/output/text/Makefile.am
@@ -0,0 +1,33 @@
+##
+## This file is part of the sigrok project.
+##
+## Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+# Local lib, this is NOT meant to be installed!
+noinst_LTLIBRARIES = libsigrokoutputtext.la
+
+libsigrokoutputtext_la_SOURCES = \
+	text.c \
+	text.h \
+	bits.c \
+	hex.c \
+	ascii.c
+
+libsigrokoutputtext_la_CFLAGS = \
+	-I$(top_srcdir)/libsigrok
+