diff --git a/_service b/_service
index 5cc6a76..4acadbe 100644
--- a/_service
+++ b/_service
@@ -9,7 +9,7 @@
*.tar
- xz
+ gz
diff --git a/crypto-policies-no-build-manpages.patch b/crypto-policies-no-build-manpages.patch
new file mode 100644
index 0000000..3278da4
--- /dev/null
+++ b/crypto-policies-no-build-manpages.patch
@@ -0,0 +1,32 @@
+Index: fedora-crypto-policies-master/Makefile
+===================================================================
+--- fedora-crypto-policies-master.orig/Makefile 2020-09-23 08:49:28.000000000 +0200
++++ fedora-crypto-policies-master/Makefile 2020-11-12 10:00:52.418204054 +0100
+@@ -60,8 +60,8 @@ clean:
+ rm -rf output
+
+ %: %.txt
+- asciidoc -v -d manpage -b docbook $<
+- xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml
++ # asciidoc -v -d manpage -b docbook $<
++ # xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml
+
+ dist:
+ rm -rf crypto-policies && git clone . crypto-policies && rm -rf crypto-policies/.git/ && tar -czf crypto-policies-git$(VERSION).tar.gz crypto-policies && rm -rf crypto-policies
+Index: fedora-crypto-policies-master
+===================================================================
+--- fedora-crypto-policies-master.orig/Makefile
++++ fedora-crypto-policies-master/Makefile
+@@ -21,9 +21,9 @@ install: $(MANPAGES)
+ mkdir -p $(DESTDIR)$(MANDIR)/man7
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+ mkdir -p $(DESTDIR)$(BINDIR)
+- install -p -m 644 $(MAN7PAGES) $(DESTDIR)$(MANDIR)/man7
+- install -p -m 644 $(MAN8PAGES) $(DESTDIR)$(MANDIR)/man8
+- install -p -m 755 $(SCRIPTS) $(DESTDIR)$(BINDIR)
++# install -p -m 644 $(MAN7PAGES) $(DESTDIR)$(MANDIR)/man7
++# install -p -m 644 $(MAN8PAGES) $(DESTDIR)$(MANDIR)/man8
++# install -p -m 755 $(SCRIPTS) $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(DIR)/
+ install -p -m 644 default-config $(DESTDIR)$(DIR)
+ install -p -m 644 output/reload-cmds.sh $(DESTDIR)$(DIR)
diff --git a/crypto-policies.7.gz b/crypto-policies.7.gz
new file mode 100644
index 0000000..d8cc82c
--- /dev/null
+++ b/crypto-policies.7.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbc5e573f2bd5dad2e405f9de35cc94c469d434b466b40890d87400f7f4cb8c1
+size 6127
diff --git a/crypto-policies.changes b/crypto-policies.changes
index 569c708..6965c3b 100644
--- a/crypto-policies.changes
+++ b/crypto-policies.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb 8 11:22:31 UTC 2021 - Pedro Monreal
+
+- Use gzip instead of xz in obscpio and sources
+
+-------------------------------------------------------------------
+Fri Feb 5 10:57:46 UTC 2021 - Pedro Monreal
+
+- Do not build the manpages to avoid build cycles
+- Add crypto-policies-no-build-manpages.patch
+
-------------------------------------------------------------------
Tue Feb 2 17:38:27 UTC 2021 - Dominique Leuenberger
diff --git a/crypto-policies.spec b/crypto-policies.spec
index b6b70b9..d6fef40 100644
--- a/crypto-policies.spec
+++ b/crypto-policies.spec
@@ -24,22 +24,27 @@ Summary: System-wide crypto policies
License: LGPL-2.1-or-later
Group: Productivity/Networking/Security
URL: https://gitlab.com/redhat-crypto/fedora-%{name}
-Source0: fedora-%{name}-%{version}.tar.xz
+Source0: fedora-%{name}-%{version}.tar.gz
Source1: README.SUSE
+Source2: crypto-policies.7.gz
+Source3: fips-mode-setup.8.gz
+Source4: fips-finish-install.8.gz
+Source5: update-crypto-policies.8.gz
Patch0: crypto-policies-asciidoc.patch
Patch1: crypto-policies-typos.patch
Patch2: crypto-policies-test_supported_modules_only.patch
-BuildRequires: asciidoc
+Patch3: crypto-policies-no-build-manpages.patch
+# BuildRequires: asciidoc
# BuildRequires: gnutls >= 3.6.0
-BuildRequires: java-devel
-BuildRequires: libxslt
+# BuildRequires: java-devel
+# BuildRequires: libxslt
# BuildRequires: openssl
-BuildRequires: perl
-BuildRequires: python3-devel >= 3.6
-BuildRequires: perl(File::Copy)
-BuildRequires: perl(File::Temp)
-BuildRequires: perl(File::Which)
-#BuildRequires: perl(File::pushd)
+# BuildRequires: perl
+# BuildRequires: python3-devel >= 3.6
+# BuildRequires: perl(File::Copy)
+# BuildRequires: perl(File::Temp)
+# BuildRequires: perl(File::Which)
+# BuildRequires: perl(File::pushd)
Recommends: crypto-policies-scripts
Conflicts: gnutls < 3.7.0
#Conflicts: libreswan < 3.28
@@ -84,6 +89,17 @@ mkdir -p -m 755 %{buildroot}%{_sysconfdir}/crypto-policies/policies/modules/
mkdir -p -m 755 %{buildroot}%{_bindir}
make DESTDIR=%{buildroot} DIR=%{_datarootdir}/crypto-policies MANDIR=%{_mandir} %{?_smp_mflags} install
+
+# Install the manpages
+mkdir -p -m 755 %{buildroot}%{_mandir}/
+mkdir -p -m 755 %{buildroot}%{_mandir}/man7/
+mkdir -p -m 755 %{buildroot}%{_mandir}/man8/
+cp %{SOURCE2} %{buildroot}%{_mandir}/man7/
+cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_mandir}/man8/
+
+# Install the executable files
+install -p -m 755 update-crypto-policies fips-finish-install fips-mode-setup %{buildroot}%{_bindir}/
+
install -p -m 644 default-config %{buildroot}%{_sysconfdir}/crypto-policies/config
touch %{buildroot}%{_sysconfdir}/crypto-policies/state/current
touch %{buildroot}%{_sysconfdir}/crypto-policies/state/CURRENT.pol
diff --git a/fedora-crypto-policies-20210118.b21c811.obscpio b/fedora-crypto-policies-20210118.b21c811.obscpio
index 22043c8..2b403a3 100644
--- a/fedora-crypto-policies-20210118.b21c811.obscpio
+++ b/fedora-crypto-policies-20210118.b21c811.obscpio
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8855cf9bc7aeb43d4169bde73f25dcf49bbab88cae89c8e6abfadfd26f90a9d3
+oid sha256:4427a57c1c7e2d54c159085fc93cf135b4c45c05097628bfdb1cd74532934416
size 259083
diff --git a/fips-finish-install.8.gz b/fips-finish-install.8.gz
new file mode 100644
index 0000000..9dd62e0
--- /dev/null
+++ b/fips-finish-install.8.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0df0d2341bf1c34847e7a9ed44ece1b6484e2f1daeb3134f16a89914a6a1cfdc
+size 881
diff --git a/fips-mode-setup.8.gz b/fips-mode-setup.8.gz
new file mode 100644
index 0000000..5f4b9f2
--- /dev/null
+++ b/fips-mode-setup.8.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de5a21524d5f6ddb030d5349c6bfb0b850ce2360d4f00bd23aaf8a0d9ad9a09d
+size 1124
diff --git a/update-crypto-policies.8.gz b/update-crypto-policies.8.gz
new file mode 100644
index 0000000..98fec27
--- /dev/null
+++ b/update-crypto-policies.8.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0151e1a8a5e4bb626284b6a2f93824f849b8d070ed017b6995a20a90f9180b2b
+size 4018