diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..efed332
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/osbuild-composer-8.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
new file mode 100644
index 0000000..18028ac
--- /dev/null
+++ b/osbuild-composer.spec
@@ -0,0 +1,226 @@
+%global goipath         github.com/osbuild/osbuild-composer
+
+Version:        8
+
+%gometa
+
+%global common_description %{expand:
+An image building service based on osbuild
+It is inspired by lorax-composer and exposes the same API.
+As such, it is a drop-in replacement.
+}
+
+Name:           osbuild-composer
+Release:        1%{?dist}
+Summary:        An image building service based on osbuild
+
+# Upstream license specification: Apache-2.0
+License:        ASL 2.0
+URL:            %{gourl}
+Source0:        %{gosource}
+
+
+BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+BuildRequires:  systemd
+%if 0%{?fedora}
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  git
+BuildRequires:  golang(github.com/aws/aws-sdk-go)
+BuildRequires:  golang(github.com/Azure/azure-storage-blob-go/azblob)
+BuildRequires:  golang(github.com/BurntSushi/toml)
+BuildRequires:  golang(github.com/coreos/go-semver/semver)
+BuildRequires:  golang(github.com/coreos/go-systemd/activation)
+BuildRequires:  golang(github.com/google/uuid)
+BuildRequires:  golang(github.com/julienschmidt/httprouter)
+BuildRequires:  golang(github.com/gobwas/glob)
+BuildRequires:  golang(github.com/google/go-cmp/cmp)
+BuildRequires:  golang(github.com/stretchr/testify/assert)
+%endif
+
+Requires: osbuild-composer-worker
+Requires: systemd
+Requires: osbuild >= 7
+
+Provides: weldr
+
+Obsoletes: golang-github-osbuild-composer < %{version}-%{release}
+Provides:  golang-github-osbuild-composer = %{version}-%{release}
+
+%description
+%{common_description}
+
+%prep
+%if 0%{?rhel}
+%forgeautosetup -p1
+%else
+%goprep
+%endif
+
+%build
+%if 0%{?rhel}
+GO_BUILD_PATH=$PWD/_build
+install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
+ln -fs $PWD $GO_BUILD_PATH/src/%{goipath}
+cd $GO_BUILD_PATH/src/%{goipath}
+install -m 0755 -vd _bin
+export PATH=$PWD/_bin${PATH:+:$PATH}
+export GOPATH=$GO_BUILD_PATH:%{gopath}
+export GOFLAGS=-mod=vendor
+%endif
+
+%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
+%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
+
+
+%if %{with tests}
+
+# Build test binaries with `go test -c`, so that they can take advantage of
+# golang's testing package. The golang rpm macros don't support building them
+# directly. Thus, do it manually, taking care to also include a build id.
+
+TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
+
+go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-tests %{goipath}/cmd/osbuild-tests
+go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
+go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/weldrcheck/
+go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-rcm-tests %{goipath}/cmd/osbuild-rcm-tests
+go test -c -tags=integration -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-image-tests %{goipath}/cmd/osbuild-image-tests
+
+%endif
+
+%install
+install -m 0755 -vd                                         %{buildroot}%{_libexecdir}/osbuild-composer
+install -m 0755 -vp _bin/osbuild-composer                   %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-worker                     %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0755 -vp dnf-json                                %{buildroot}%{_libexecdir}/osbuild-composer/
+
+install -m 0755 -vd                                         %{buildroot}%{_datadir}/osbuild-composer/repositories
+install -m 0644 -vp repositories/*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
+
+install -m 0755 -vd                                         %{buildroot}%{_unitdir}
+install -m 0644 -vp distribution/*.{service,socket}         %{buildroot}%{_unitdir}/
+
+install -m 0755 -vd                                         %{buildroot}%{_sysusersdir}
+install -m 0644 -vp distribution/osbuild-composer.conf      %{buildroot}%{_sysusersdir}/
+
+install -m 0755 -vd                                         %{buildroot}%{_localstatedir}/cache/osbuild-composer/dnf-cache
+
+%if %{with tests}
+
+install -m 0755 -vd                                         %{buildroot}%{_libexecdir}/tests/osbuild-composer
+install -m 0755 -vp _bin/osbuild-tests                      %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-weldr-tests                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-dnf-json-tests             %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-image-tests                %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+install -m 0755 -vp _bin/osbuild-rcm-tests                  %{buildroot}%{_libexecdir}/tests/osbuild-composer/
+install -m 0755 -vp tools/image-info                        %{buildroot}%{_libexecdir}/osbuild-composer/
+
+install -m 0755 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer/cases
+install -m 0644 -vp test/cases/*                            %{buildroot}%{_datadir}/tests/osbuild-composer/cases/
+install -m 0755 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer/keyring
+install -m 0600 -vp test/keyring/*                          %{buildroot}%{_datadir}/tests/osbuild-composer/keyring/
+
+install -m 0755 -vd                                         %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init
+install -m 0644 -vp test/cloud-init/*                       %{buildroot}%{_datadir}/tests/osbuild-composer/cloud-init/
+
+%endif
+
+%check
+%if 0%{?rhel}
+export GOFLAGS=-mod=vendor
+export GOPATH=$PWD/_build:%{gopath}
+%gotest ./...
+%else
+%gocheck
+%endif
+
+%post
+%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
+
+%preun
+%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
+
+%postun
+%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
+
+%files
+%license LICENSE
+%doc README.md
+%{_libexecdir}/osbuild-composer/osbuild-composer
+%{_libexecdir}/osbuild-composer/dnf-json
+%{_datadir}/osbuild-composer/
+%{_unitdir}/osbuild-composer.service
+%{_unitdir}/osbuild-composer.socket
+%{_unitdir}/osbuild-remote-worker.socket
+%{_sysusersdir}/osbuild-composer.conf
+
+%package rcm
+Summary:    RCM-specific version of osbuild-composer
+Requires:   osbuild-composer
+
+Obsoletes: golang-github-osbuild-composer-rcm < %{version}-%{release}
+Provides:  golang-github-osbuild-composer-rcm = %{version}-%{release}
+
+%description rcm
+RCM-specific version of osbuild-composer not intended for public usage.
+
+%files rcm
+%{_unitdir}/osbuild-rcm.socket
+
+%post rcm
+%systemd_post osbuild-rcm.socket
+
+%preun rcm
+%systemd_preun osbuild-rcm.socket
+
+%postun rcm
+%systemd_postun_with_restart osbuild-rcm.socket
+
+%package worker
+Summary:    The worker for osbuild-composer
+Requires:   systemd
+Requires:   osbuild
+
+Obsoletes: golang-github-osbuild-composer-worker < %{version}-%{release}
+Provides:  golang-github-osbuild-composer-worker = %{version}-%{release}
+
+%description worker
+The worker for osbuild-composer
+
+%files worker
+%{_libexecdir}/osbuild-composer/osbuild-worker
+%{_unitdir}/osbuild-worker@.service
+%{_unitdir}/osbuild-remote-worker@.service
+
+%post worker
+%systemd_post osbuild-worker@.service osbuild-remote-worker@.service
+
+%preun worker
+%systemd_preun osbuild-worker@.service osbuild-remote-worker@.service
+
+%postun worker
+%systemd_postun_with_restart osbuild-worker@.service osbuild-remote-worker@.service
+
+%if %{with tests}
+
+%package tests
+Summary:    Integration tests
+Requires:   osbuild-composer
+Requires:   composer-cli
+Requires:   createrepo_c
+Requires:   genisoimage
+Requires:   qemu-kvm-core
+
+%description tests
+Integration tests to be run on a pristine-dedicated system to test the osbuild-composer package.
+
+%files tests
+%{_libexecdir}/tests/osbuild-composer/
+%{_datadir}/tests/osbuild-composer/
+%{_libexecdir}/osbuild-composer/image-info
+
+%endif
+
+%changelog
+* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
+- Initial package (renamed from golang-github-osbuild-composer)
diff --git a/sources b/sources
new file mode 100644
index 0000000..ae03ec8
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (osbuild-composer-8.tar.gz) = 374cb9a58e013ca1f9b03818f8d57925cb447fe7da9d9a208635313718417f9d3ca93723f834386f808de31228d5fc9138545f33bde4ae0b49d6ce94349a9ed7