diff --git a/Makefile.am b/Makefile.am
index 3e1f27e..b59d2f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,18 +3,6 @@ SUBDIRS = swe swe/src swe/doc src po docs/reference/swe-glib data
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = swe-glib.pc $(NULL)
-
-headerdir = $(includedir)/swe-glib
-header_DATA =            \
-	src/swe-glib.h       \
-	src/gswe-types.h     \
-	src/gswe-enumtypes.h \
-	src/gswe-moment.h    \
-	src/gswe-timestamp.h \
-	$(NULL)
-
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
 EXTRA_DIST = $(intltool_extra) $(header_DATA) autogen.sh
diff --git a/configure.ac b/configure.ac
index 5f1af6f..6a85da0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,6 @@ AC_CONFIG_FILES([
     data/Makefile
     po/Makefile.in
     docs/reference/swe-glib/Makefile
-    swe-glib.pc
+    data/swe-glib.pc
 ])
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index c78fff2..dc3cc1e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,6 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = swe-glib.pc $(NULL)
+
 swephdir = $(pkgdatadir)
 sweph_DATA = \
 	sweph-data/seas_00.se1 \
diff --git a/swe-glib.pc.in b/data/swe-glib.pc.in
similarity index 100%
rename from swe-glib.pc.in
rename to data/swe-glib.pc.in
diff --git a/src/Makefile.am b/src/Makefile.am
index f1f4ff4..d99c442 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,10 +11,14 @@ INST_H_SRC_FILES = \
 INST_H_BUILT_FILES = \
 	gswe-enumtypes.h
 
-libswe_glib_sources = swe-glib.c gswe-moment.c gswe-timestamp.c gswe-enumtypes.c
 gswe_headers = gswe-timestamp.h gswe-types.h
 
-libswe_glib_1_0_la_SOURCES = $(libswe_glib_sources)
+libswe_glib_1_0_la_SOURCES = \
+	swe-glib.c       \
+	gswe-moment.c    \
+	gswe-timestamp.c \
+	gswe-enumtypes.c \
+	$(NULL)
 libswe_glib_1_0_la_CFLAGS = $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) -Wall
 libswe_glib_1_0_la_LIBADD = $(GLIB_LIBS) $(GOBJECT_LIBS) $(LIBSWE_LIBS)
 
@@ -50,6 +54,16 @@ gir_DATA = SweGlib-$(SWE_GLIB_API_VERSION).gir
 typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = SweGlib-$(SWE_GLIB_API_VERSION).typelib
 
+headerdir = $(includedir)/swe-glib
+header_DATA =            \
+	swe-glib.h       \
+	gswe-types.h     \
+	gswe-enumtypes.h \
+	gswe-moment.h    \
+	gswe-timestamp.h \
+	$(NULL)
+
+
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 
 endif