diff --git a/Makefile.am b/Makefile.am
index d17b749..9731c6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 SUBDIRS = lib
 
-INCLUDES=${gammu_CFLAGS}
+include_HEADERS = yasnd.h
+
 yasnd_LDADD = ${libconfuse_LIBS}
-yasnd_LDADD += ${gammu_LIBS}
 yasnd_LDADD += lib/libyasnd.la
 sbin_PROGRAMS = yasnd
-yasnd_SOURCES = yasnd.c yasnd-gammu.c yasnd-ipc.c
+yasnd_SOURCES = yasnd.c yasnd-ipc.c
 
 distclean-local:
 	rm -rf aclocal.m4 m4 autom4te.cache depcomp install-sh missing configure Makefile.in config.h* &>/dev/null
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c780b8f..a01fc74 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,9 @@
+INCLUDES=${gammu_CFLAGS}
+
 lib_LTLIBRARIES = libyasnd.la
-libyasnd_la_SOURCES = libyasnd.c
+libyasnd_la_SOURCES = libyasnd.c yasnd-gammu.c
 libyasnd_la_CPPFLAGS = -I$(top_srcdir)
+libyasnd_la_LIBADD = ${gammu_LIBS}
 
 distclean-local:
 	rm -f Makefile.in &>/dev/null
diff --git a/yasnd-gammu.c b/lib/yasnd-gammu.c
similarity index 100%
rename from yasnd-gammu.c
rename to lib/yasnd-gammu.c