diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ecc25345ebdac4956b9b544676852011f74e7c73..8383e8cfda0bb5b78d4d2bb0f6d9be483906fbea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: node
 
 stages:
   - build
+  - packaging
   - test
 
 test_frontend:
@@ -16,6 +17,8 @@ build_war:
   stage: build
   only:
     - tags
+  tags:
+     - privileged
   artifacts:
     paths:
       - minerva.war
@@ -29,7 +32,7 @@ build_war:
 
 build_debian_package:
   image: debian
-  stage: build
+  stage: packaging
   only:
     - tags
   tags:
@@ -84,4 +87,32 @@ test_install_debian_package:
      - test 200 = $(curl --write-out %{http_code} --silent --output /dev/null -c cookie.txt http://localhost:8080/minerva/api/doLogin)
      - test 200 = $(curl --write-out %{http_code} --silent --output /dev/null --cookie cookie.txt http://localhost:8080/minerva/api/projects/)
 
+build_rpm:
+  image: centos:7
+  stage: packaging
+  dependencies:
+    - build_war
+  only:
+    - tags
+  tags:
+     - privileged
+  artifacts:
+    paths:
+      - "rpm/rpmbuildtemp/RPMS/noarch/minerva-*.rpm"
+  script:
+    - yum -y install rpmdevtools unzip
+    - rpm/buildrpm.sh minerva.war
+
+rpmlint:
+  image: centos:7
+  stage: test
+  dependencies:
+    - build_rpm
+  tags:
+     - privileged
+  only:
+    - tags
+  script:
+    - yum -y install rpmlint
+    - rpmlint rpm/rpmbuildtemp/RPMS/noarch/minerva-*.rpm
 
diff --git a/CHANGELOG b/CHANGELOG
index 7add9e01945b4afb6bd6cf94d3ff27b8aac1c711..559e417b35a41a0a59c3040f4cceef1a3f3b37e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,13 +3,16 @@ minerva (12.1.0~alpha.0) experimental; urgency=medium
   * Feature: support of all CellDesigner element modifications
   * Feature: ldap authentication
   * Feature: multicolored anchors for data overlays
+  * Feature: minerva is distributed using rpm packages
   * Bug fix: annotations for elements with mutation in name (like "BID (p15)")
     weren't provided properly
   * Small improvement: annotations from RHEA are handled
+  * Small improvement: changing of Terms of Service url allows admin to reset
+    the status of ToS acceptance for all users
   * Small improvement: description of a grouped results in improved
   * Small improvement: selection of required annotation on map upload improved
 
- -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 25 Jul 2018 10:00:00 +0200
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Fri, 03 Aug 2018 10:00:00 +0200
 
 minerva (12.0.2) stable; urgency=medium
   * Bug fix: data overlay by annotation type fixed