diff --git a/.gitignore b/.gitignore
index e245806..3bf8b9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,14 @@
+bolt-*/
+x86_64/
+results_bolt/
+*.log
+*.rpm
+
+#tarballs
 /bolt-0.1.tar.gz
 /bolt-0.2.tar.gz
 /bolt-0.3.tar.gz
 /bolt-0.4.tar.gz
+/bolt-0.5.tar.gz
+/bolt-0.6.tar.gz
+/bolt-0.7.tar.gz
diff --git a/bolt.spec b/bolt.spec
index 77fb8c1..6d1832d 100644
--- a/bolt.spec
+++ b/bolt.spec
@@ -1,15 +1,12 @@
-%global forgeurl  https://github.com/gicmo/bolt
-
 Name:          bolt
-Version:       0.4
-%global tag    %{version}
-%forgemeta
-Release:       2%{?dist}
+Version:       0.7
+Release:       1%{?dist}
 Summary:       Thunderbolt device manager
 License:       LGPLv2+
-URL:           %{forgeurl}
-Source0:       %{forgesource}
+URL:           https://gitlab.freedesktop.org/bolt/bolt
+Source0:       %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz
 
+BuildRequires: gcc
 BuildRequires: asciidoc
 BuildRequires: meson
 BuildRequires: libudev-devel
@@ -17,12 +14,16 @@ BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(libudev)
 BuildRequires: pkgconfig(systemd)
 BuildRequires: polkit-devel
+BuildRequires: systemd
+%{?systemd_requires}
+
+# for the integration test (optional)
+%if 0%{?fedora}
 BuildRequires: pygobject3-devel
 BuildRequires: python3-dbus
 BuildRequires: python3-dbusmock
 BuildRequires: umockdev-devel
-BuildRequires: systemd
-%{?systemd_requires}
+%endif
 
 %description
 bolt is a system daemon to manage thunderbolt 3 devices via a D-BUS
@@ -37,10 +38,10 @@ boltctl, can be used to control the daemon and perform all the above
 mentioned tasks.
 
 %prep
-%forgesetup
+%setup -q
 
 %build
-%meson -Ddb-path=%{_localstatedir}/lib/boltd
+%meson -Ddb-name=boltd
 %meson_build
 
 %check
@@ -48,8 +49,6 @@ mentioned tasks.
 
 %install
 %meson_install
-install -m0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/boltd
-
 
 %post
 %systemd_post %{name}.service
@@ -74,9 +73,20 @@ install -m0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/boltd
 %{_datadir}/dbus-1/system-services/org.freedesktop.bolt.service
 %{_mandir}/man1/boltctl.1*
 %{_mandir}/man8/boltd.8*
-%dir %{_localstatedir}/lib/boltd
+%ghost %dir %{_localstatedir}/lib/boltd
 
 %changelog
+* Tue Jan  1 2019 Christian Kellner <gicmo@redhat.com> - 0.7-1
+- bolt 0.7 release
+
+* Wed Nov 28 2018 Christian Kellner <ckellner@redhat.com> - 0.6-1
+- bolt 0.6 release
+
+* Fri Sep 21 2018 Christian Kellner <ckellner@redhat.com> - 0.5-1
+- bolt 0.5 release
+- Remove forge macros again and use gitlab as authorative source
+- Testing depedencies are now only pulled in on Fedora
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 4ff25be..d79317f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bolt-0.4.tar.gz) = 3ea6b748768b5d9df60425274ecdb4ccd5ce6599e01f0648a24704643fbbadd7a114d4a1946ee3b7bd8866935758cbfe4494734c26c12ccc508c205a036d5317
+SHA512 (bolt-0.7.tar.gz) = 6786f701501cc2680fac52cda7cdfe37971044abcf058b5c83bfa9f1d0a0381ba00e3377cfc97fcccf53760a2eafc1f8f6d0754f0e121d94201711ad8e40a135