diff --git a/data/Makefile.am b/data/Makefile.am
index a9546a74..5b22b88e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,13 +15,14 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-styledir = $(pkgdatadir)/style
-
-dist_style_DATA =               \
-	theme/gtk-styles.css
-
 EXTRA_DIST=                     \
   gnome-calendar.desktop        \
+  calendar.gresource.xml        \
+  ui/nav_bar.ui                 \
+  ui/new-event.ui               \
+  ui/viewport.ui                \
+  theme/gtk-styles.css          \
+  theme/close-window.svg        \
   $(desktop_in_files)           \
   $(gsettingsschema_in_files)
 
diff --git a/src/calendar.gresource.xml b/data/calendar.gresource.xml
similarity index 62%
rename from src/calendar.gresource.xml
rename to data/calendar.gresource.xml
index 3b653d5b..a85f8ce7 100644
--- a/src/calendar.gresource.xml
+++ b/data/calendar.gresource.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/calendar">
-    <file alias="nav_bar.ui" compressed="true" preprocess="xml-stripblanks">../data/ui/nav_bar.ui</file>
-    <file alias="viewport.ui" compressed="true" preprocess="xml-stripblanks">../data/ui/viewport.ui</file>
-    <file alias="new-event.ui" compressed="true" preprocess="xml-stripblanks">../data/ui/new-event.ui</file>
-    <file alias="close.svg" compressed="true" preprocess="xml-stripblanks">../data/theme/close-window.svg</file>
+    <file alias="nav_bar.ui" compressed="true" preprocess="xml-stripblanks">ui/nav_bar.ui</file>
+    <file alias="viewport.ui" compressed="true" preprocess="xml-stripblanks">ui/viewport.ui</file>
+    <file alias="new-event.ui" compressed="true" preprocess="xml-stripblanks">ui/new-event.ui</file>
+    <file alias="close.svg" compressed="true" preprocess="xml-stripblanks">theme/close-window.svg</file>
+    <file alias="gtk-styles.css" compressed="true">theme/gtk-styles.css</file>
   </gresource>
 </gresources>
diff --git a/src/Makefile.am b/src/Makefile.am
index d67df09a..856f6cb5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,11 +75,11 @@ gnome_calendar_LDADD =                                    \
   $(top_builddir)/libgd/libgd.la                          \
   $(CALENDAR_LIBS)
 
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/calendar.gresource.xml)
-gcal-resources.c: calendar.gresource.xml $(resource_files)
-	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name calendar $(srcdir)/calendar.gresource.xml
-gcal-resources.h: calendar.gresource.xml $(resource_files)
-	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name calendar $(srcdir)/calendar.gresource.xml
+resource_files = $(shell glib-compile-resources --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/calendar.gresource.xml)
+gcal-resources.c: $(top_srcdir)/data/calendar.gresource.xml $(resource_files)
+	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --c-name calendar $(top_srcdir)/data/calendar.gresource.xml
+gcal-resources.h: $(top_srcdir)/data/calendar.gresource.xml $(resource_files)
+	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-header --c-name calendar $(top_srcdir)/data/calendar.gresource.xml
 
 ENUM_TYPES =                                              \
     gcal-utils.h