diff --git a/src/libguacd/Makefile.am b/src/libguacd/Makefile.am
index 82c08882..a8d2a9f5 100644
--- a/src/libguacd/Makefile.am
+++ b/src/libguacd/Makefile.am
@@ -19,10 +19,12 @@
 
 AUTOMAKE_OPTIONS = foreign 
 
-noinst_LTLIBRARIES = libguacd.la
+lib_LTLIBRARIES = libguacd.la
 
-noinst_HEADERS =    \
-    libguacd/log.h  \
+libguacdincdir = $(includedir)/libguacd
+
+libguacdinc_HEADERS =    \
+    libguacd/log.h       \
     libguacd/user.h
 
 libguacd_la_SOURCES = \
@@ -42,7 +44,7 @@ libguacd_la_LDFLAGS = \
 
 # SSL support
 if ENABLE_SSL
-noinst_HEADERS      += libguacd/socket-ssl.h
+libguacdinc_HEADERS += libguacd/socket-ssl.h
 libguacd_la_SOURCES += socket-ssl.c
 endif