diff --git a/libzypp-plugin-appdata.changes b/libzypp-plugin-appdata.changes
index 641233a..cefd21e 100644
--- a/libzypp-plugin-appdata.changes
+++ b/libzypp-plugin-appdata.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Apr  7 11:42:52 UTC 2015 - dimstar@opensuse.org
+
+- Move openSUSE-appstream-process to appstream-glib package, as
+  updating one often means a change in the other anyway.
+- Rename openSUSE-appstream-extra to openSUSE-appdata-extra, to
+  better reflect what content to expect in this package (after the
+  github reorganisation).
+
 -------------------------------------------------------------------
 Thu Apr  2 13:38:08 UTC 2015 - dimstar@opensuse.org
 
diff --git a/libzypp-plugin-appdata.spec b/libzypp-plugin-appdata.spec
index 8ed0fe1..0f246f9 100644
--- a/libzypp-plugin-appdata.spec
+++ b/libzypp-plugin-appdata.spec
@@ -24,13 +24,12 @@ License:        MIT
 Group:          System/Libraries
 Url:            https://wiki.gnome.org/Design/Apps/Software
 Source0:        openSUSE-appstream-1.0.tar.xz
-Source1:        openSUSE-appstream-process
 Source2:        InstallAppdata.sh
 BuildArch:      noarch
 BuildRequires:  appstream-glib >= 0.2.4
 BuildRequires:  fdupes
 # appstream-glib >= 0.3.6 is the first to correctly to appstream-util uninstall in /var/cache
-Requires:       appstream-glib > 0.3.5
+Requires:       appstream-glib >= 0.3.6
 # appdata hook was introduced in libzypp 14.29.4
 Requires:       libzypp >= 14.29.4
 
@@ -41,22 +40,11 @@ software centers.
 
 At this moment, gnome-software is the only known implementation making use of it.
 
-%package -n openSUSE-appstream-process
-Summary:        Appstream processor employed by kiwi
-Group:          System
-Requires:       appstream-glib >= 0.3.5
-# external repository with appstream metadata, to assist packages that don't ship their own (yet)
-Requires:       openSUSE-appstream-extra
-
-%description -n openSUSE-appstream-process
-A wrapper around appstream-builder, called by kiwi in order to produce AppStream metadata
-for the repositories to be published
-
-%package -n openSUSE-appstream-extra
+%package -n openSUSE-appdata-extra
 Summary:        Additional Appstream Metadata
 Group:          System
 
-%description -n openSUSE-appstream-extra
+%description -n openSUSE-appdata-extra
 This package contains extra appstream metadata to be used by appstream-builder
 
 %prep
@@ -65,15 +53,9 @@ This package contains extra appstream metadata to be used by appstream-builder
 %build
 
 %install
-# install the appstream process script to be used by kiwi
-install -d -m 0755 %{_buildroot}%{_bindir}
-install -m 0755 -D %{S:1} %{buildroot}%{_bindir}/$(basename %{S:1})
 # install the additional appstream metadata
-install -m 0755 -d %{buildroot}%{_datadir}/appstream-extra
-for DATA in appdata-extra  appstream-extra  screenshots-extra
-do
-  cp -r ${DATA} %{buildroot}%{_datadir}/appstream-extra/
-done
+install -m 0755 -d %{buildroot}%{_datadir}/appdata-extra
+cp appdata-extra/*/* %{buildroot}%{_datadir}/appdata-extra/
 
 # Install AppData zypp plugin - temporarily disabled in favor of static AppStream metadata
 install -Dm 0755 %{S:2} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basename %{S:2})
@@ -90,8 +72,8 @@ install -Dm 0755 %{S:2} %{buildroot}%{_prefix}/lib/zypp/plugins/appdata/$(basena
 %defattr(-,root,root)
 %{_bindir}/openSUSE-appstream-process
 
-%files -n openSUSE-appstream-extra
+%files -n openSUSE-appdata-extra
 %defattr(-,root,root)
-%{_datadir}/appstream-extra/
+%{_datadir}/appdata-extra/
 
 %changelog
diff --git a/openSUSE-appstream-process b/openSUSE-appstream-process
deleted file mode 100644
index 3f56699..0000000
--- a/openSUSE-appstream-process
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-SRC=$1
-DEST=$2
-
-# appstream-buider should be more quiet while parsing packages
-export ASB_IS_SELF_TEST=1
-
-/usr/bin/appstream-builder \
-  --no-net						\
-  --enable-hidpi					\
-  --include-failed					\
-  --temp-dir=/tmp/apb					\
-  --cache-dir=/tmp/apb/cache				\
-  --origin=appdata					\
-  --api-version=0.8					\
-  --basename=appdata					\
-  --extra-appdata-dir=/usr/share/appstream-extra/	\
-  --packages-dir=${SRC}					\
-  --output-dir=${DEST}					\
-  --screenshot-uri=http://static.opensuse.org/screenshots/openSUSE-13.2
-
-/usr/bin/appstream-util 	\
-  status-html			\
-  ${DEST}/appdata.xml.gz 	\
-  ${DEST}/appdata.html
-
-/usr/bin/appstream-util 	\
-  status-html			\
-  ${DEST}/appdata-failed.xml.gz \
-  ${DEST}/appdata-failed.html
-