diff --git a/.gitignore b/.gitignore
index adc2e6e..edfdcab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /abimap-0.3.0.tar.gz
+/abimap-0.3.1.tar.gz
diff --git a/python-abimap-0.3.0-fix-releases-order.patch b/python-abimap-0.3.0-fix-releases-order.patch
deleted file mode 100644
index f1827ba..0000000
--- a/python-abimap-0.3.0-fix-releases-order.patch
+++ /dev/null
@@ -1,594 +0,0 @@
-diff --git a/src/abimap/symver.py b/src/abimap/symver.py
-index 5eb6a05..5c41285 100644
---- a/src/abimap/symver.py
-+++ b/src/abimap/symver.py
-@@ -731,7 +731,7 @@ class Map(object):
-             self.logger.error(msg)
-             raise Exception(msg)
- 
--        self.releases.sort(key=lambda release: release.name)
-+        self.releases.sort(key=lambda release: release.name, reverse=True)
-         dependencies = self.dependencies()
-         top_dependency = next((dependency for dependency in dependencies if
-                                dependency[0] == top_release))
-diff --git a/tests/data_template/test_as_lib/update_default_name.stdout b/tests/data_template/test_as_lib/update_default_name.stdout
-index 40a21dc..e24ebdc 100644
---- a/tests/data_template/test_as_lib/update_default_name.stdout
-+++ b/tests/data_template/test_as_lib/update_default_name.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--BASE_1_1_0
--{
--    global:
--        symbol;
--} BASE_1_0_0;
--
- BASE_1_0_0
- {
-     global:
-@@ -17,3 +11,9 @@ BASE_1_0_0
-         *;
- } ;
- 
-+BASE_1_1_0
-+{
-+    global:
-+        symbol;
-+} BASE_1_0_0;
-+
-diff --git a/tests/data_template/test_as_lib/update_different_name.stdout b/tests/data_template/test_as_lib/update_different_name.stdout
-index cb7061d..02baf75 100644
---- a/tests/data_template/test_as_lib/update_different_name.stdout
-+++ b/tests/data_template/test_as_lib/update_different_name.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with someapp-PROGRAM_VERSION
- 
--BASE_1_1_0
--{
--    global:
--        symbol;
--} BASE_1_0_0;
--
- BASE_1_0_0
- {
-     global:
-@@ -17,3 +11,9 @@ BASE_1_0_0
-         *;
- } ;
- 
-+BASE_1_1_0
-+{
-+    global:
-+        symbol;
-+} BASE_1_0_0;
-+
-diff --git a/tests/data_template/test_script/update_add.stdout b/tests/data_template/test_script/update_add.stdout
-index 40a21dc..e24ebdc 100644
---- a/tests/data_template/test_script/update_add.stdout
-+++ b/tests/data_template/test_script/update_add.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--BASE_1_1_0
--{
--    global:
--        symbol;
--} BASE_1_0_0;
--
- BASE_1_0_0
- {
-     global:
-@@ -17,3 +11,9 @@ BASE_1_0_0
-         *;
- } ;
- 
-+BASE_1_1_0
-+{
-+    global:
-+        symbol;
-+} BASE_1_0_0;
-+
-diff --git a/tests/data_template/test_update/add.outfile b/tests/data_template/test_update/add.outfile
-index a52efb1..d8b11a5 100644
---- a/tests/data_template/test_update/add.outfile
-+++ b/tests/data_template/test_update/add.outfile
-@@ -1,11 +1,5 @@
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--LIBTC1_1_1_0
--{
--    global:
--        symbol;
--} LIBTC1_1_0_0;
--
- LIBTC1_1_0_0
- {
-     global:
-@@ -14,3 +8,9 @@ LIBTC1_1_0_0
-         *;
- } ;
- 
-+LIBTC1_1_1_0
-+{
-+    global:
-+        symbol;
-+} LIBTC1_1_0_0;
-+
-diff --git a/tests/data_template/test_update/add_final.stdout b/tests/data_template/test_update/add_final.stdout
-index 368a3da..04e2a9d 100644
---- a/tests/data_template/test_update/add_final.stdout
-+++ b/tests/data_template/test_update/add_final.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--LIBTC1_1_1_0    # Released
--{
--    global:
--        symbol;
--} LIBTC1_1_0_0;
--
- LIBTC1_1_0_0
- {
-     global:
-@@ -17,3 +11,9 @@ LIBTC1_1_0_0
-         *;
- } ;
- 
-+LIBTC1_1_1_0    # Released
-+{
-+    global:
-+        symbol;
-+} LIBTC1_1_0_0;
-+
-diff --git a/tests/data_template/test_update/add_present.stdout b/tests/data_template/test_update/add_present.stdout
-index 0581569..0ea5c5d 100644
---- a/tests/data_template/test_update/add_present.stdout
-+++ b/tests/data_template/test_update/add_present.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--ADD_PRESENT_1_1_0
--{
--    global:
--        symbol;
--} ADD_PRESENT_1_0_0;
--
- ADD_PRESENT_1_0_0
- {
-     global:
-@@ -17,3 +11,9 @@ ADD_PRESENT_1_0_0
-         *;
- } ;
- 
-+ADD_PRESENT_1_1_0
-+{
-+    global:
-+        symbol;
-+} ADD_PRESENT_1_0_0;
-+
-diff --git a/tests/data_template/test_update/add_with_wildcard.stdout b/tests/data_template/test_update/add_with_wildcard.stdout
-index 18d86d9..f5e28e8 100644
---- a/tests/data_template/test_update/add_with_wildcard.stdout
-+++ b/tests/data_template/test_update/add_with_wildcard.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--WITH_WILDCARD_1_1_0
--{
--    global:
--        symbol;
--} WITH_WILDCARD_1_0_0;
--
- WITH_WILDCARD_1_0_0
- {
-     global:
-@@ -18,3 +12,9 @@ WITH_WILDCARD_1_0_0
-         *;
- } ;
- 
-+WITH_WILDCARD_1_1_0
-+{
-+    global:
-+        symbol;
-+} WITH_WILDCARD_1_0_0;
-+
-diff --git a/tests/data_template/test_update/circular_dependency.map b/tests/data_template/test_update/circular_dependency.map
-index a74b1b0..4f3b2a5 100644
---- a/tests/data_template/test_update/circular_dependency.map
-+++ b/tests/data_template/test_update/circular_dependency.map
-@@ -1,16 +1,12 @@
- # Broken map with circular dependency
- 
--LIBTC5_9_2_0
--{
--    global:
--        one_symbol;
--} LIBTC5_9_1_0;
--
--LIBTC5_9_1_0
-+LIBBASE_1_0_0
- {
-     global:
--        two_symbol;
--} LIBTC5_9_0_0;
-+        zero_symbol;
-+    local:
-+        *;
-+} ;
- 
- LIBTC5_9_0_0
- {
-@@ -18,11 +14,15 @@ LIBTC5_9_0_0
-         three_symbol;
- } LIBTC5_9_2_0;
- 
--LIBBASE_1_0_0
-+LIBTC5_9_1_0
- {
-     global:
--        zero_symbol;
--    local:
--        *;
--} ;
-+        two_symbol;
-+} LIBTC5_9_0_0;
-+
-+LIBTC5_9_2_0
-+{
-+    global:
-+        one_symbol;
-+} LIBTC5_9_1_0;
- 
-diff --git a/tests/data_template/test_update/duplicated_dependency.map b/tests/data_template/test_update/duplicated_dependency.map
-index 8d8bc0b..e469778 100644
---- a/tests/data_template/test_update/duplicated_dependency.map
-+++ b/tests/data_template/test_update/duplicated_dependency.map
-@@ -1,15 +1,9 @@
- # Broken map with duplicated dependency
- 
--LIBTC5_9_1_0
--{
--    global:
--        other_symbol;
--} LIBTC5_9_0_0;
--
- LIBTC5_9_0_0
- {
-     global:
--        another_symbol;
-+        one_more_symbol;
-     local:
-         *;
- } ;
-@@ -17,7 +11,14 @@ LIBTC5_9_0_0
- LIBTC5_9_0_0
- {
-     global:
--        one_more_symbol;
-+        another_symbol;
-     local:
-         *;
- } ;
-+
-+LIBTC5_9_1_0
-+{
-+    global:
-+        other_symbol;
-+} LIBTC5_9_0_0;
-+
-diff --git a/tests/data_template/test_update/duplicated_symbol.stdout b/tests/data_template/test_update/duplicated_symbol.stdout
-index b746c74..b5b0bed 100644
---- a/tests/data_template/test_update/duplicated_symbol.stdout
-+++ b/tests/data_template/test_update/duplicated_symbol.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--DUPLICATED_1_1_0
--{
--    global:
--        symbol;
--} DUPLICATED_1_0_0;
--
- DUPLICATED_1_0_0
- {
-     global:
-@@ -18,3 +12,9 @@ DUPLICATED_1_0_0
-         *;
- } ;
- 
-+DUPLICATED_1_1_0
-+{
-+    global:
-+        symbol;
-+} DUPLICATED_1_0_0;
-+
-diff --git a/tests/data_template/test_update/missing_global.stdout b/tests/data_template/test_update/missing_global.stdout
-index 0f8d472..9efab21 100644
---- a/tests/data_template/test_update/missing_global.stdout
-+++ b/tests/data_template/test_update/missing_global.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--MISSING_GLOBAL_1_1_0
--{
--    global:
--        symbol;
--} MISSING_GLOBAL_1_0_0;
--
- MISSING_GLOBAL_1_0_0
- {
-     global:
-@@ -18,3 +12,9 @@ MISSING_GLOBAL_1_0_0
-         *;
- } ;
- 
-+MISSING_GLOBAL_1_1_0
-+{
-+    global:
-+        symbol;
-+} MISSING_GLOBAL_1_0_0;
-+
-diff --git a/tests/data_template/test_update/mixed_names.stdout b/tests/data_template/test_update/mixed_names.stdout
-index 89407ee..2cc9c03 100644
---- a/tests/data_template/test_update/mixed_names.stdout
-+++ b/tests/data_template/test_update/mixed_names.stdout
-@@ -3,23 +3,17 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--ROGUE_RELEASE_4_6_0
--{
--    global:
--        symbol;
--} ROGUE_RELEASE_4_5_6;
--
- ROGUE_RELEASE_4_5_6
- {
-     global:
-         three_symbol;
- } ;
- 
--OTHER_DIFFERENT_NAME_1_1_0
-+ROGUE_RELEASE_4_6_0
- {
-     global:
--        two_symbol;
--} NAME_1_0_0;
-+        symbol;
-+} ROGUE_RELEASE_4_5_6;
- 
- NAME_1_0_0
- {
-@@ -29,3 +23,9 @@ NAME_1_0_0
-         *;
- } ;
- 
-+OTHER_DIFFERENT_NAME_1_1_0
-+{
-+    global:
-+        two_symbol;
-+} NAME_1_0_0;
-+
-diff --git a/tests/data_template/test_update/non_existing_previous.map b/tests/data_template/test_update/non_existing_previous.map
-index 2e39025..7c1bd6c 100644
---- a/tests/data_template/test_update/non_existing_previous.map
-+++ b/tests/data_template/test_update/non_existing_previous.map
-@@ -1,11 +1,5 @@
- # Broken map with non-existing dependency
- 
--LIBTC5_8_1_0
--{
--    global:
--        other_symbol;
--} LIBTC5_8_0_0;
--
- LIBBASE_1_0_0
- {
-     global:
-@@ -13,3 +7,10 @@ LIBBASE_1_0_0
-     local:
-         *;
- } ;
-+
-+LIBTC5_8_1_0
-+{
-+    global:
-+        other_symbol;
-+} LIBTC5_8_0_0;
-+
-diff --git a/tests/data_template/test_update/only_visibility.stdout b/tests/data_template/test_update/only_visibility.stdout
-index 5498e3d..8e86319 100644
---- a/tests/data_template/test_update/only_visibility.stdout
-+++ b/tests/data_template/test_update/only_visibility.stdout
-@@ -3,15 +3,15 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--ONLY_VISIBILITY_1_1_0
--{
--    global:
--        symbol;
--} ONLY_VISIBILITY_1_0_0;
--
- ONLY_VISIBILITY_1_0_0
- {
-     global:
-     local:
- } ;
- 
-+ONLY_VISIBILITY_1_1_0
-+{
-+    global:
-+        symbol;
-+} ONLY_VISIBILITY_1_0_0;
-+
-diff --git a/tests/data_template/test_update/sanity_add.stdout b/tests/data_template/test_update/sanity_add.stdout
-index f746e38..97db098 100644
---- a/tests/data_template/test_update/sanity_add.stdout
-+++ b/tests/data_template/test_update/sanity_add.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--LIBTC1_1_1_0
--{
--    global:
--        symbol;
--} LIBTC1_1_0_0;
--
- LIBTC1_1_0_0
- {
-     global:
-@@ -17,3 +11,9 @@ LIBTC1_1_0_0
-         *;
- } ;
- 
-+LIBTC1_1_1_0
-+{
-+    global:
-+        symbol;
-+} LIBTC1_1_0_0;
-+
-diff --git a/tests/data_template/test_update/split.stdout b/tests/data_template/test_update/split.stdout
-index f822580..3be0e5e 100644
---- a/tests/data_template/test_update/split.stdout
-+++ b/tests/data_template/test_update/split.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--SPLIT_1_1_0
--{
--    global:
--        symbol;
--} SPLIT_1_0_0;
--
- SPLIT_1_0_0
- {
-     global:
-@@ -18,3 +12,9 @@ SPLIT_1_0_0
-         *;
- } ;
- 
-+SPLIT_1_1_0
-+{
-+    global:
-+        symbol;
-+} SPLIT_1_0_0;
-+
-diff --git a/tests/data_template/test_update/symbols.out b/tests/data_template/test_update/symbols.out
-index 74a7ecd..d4cea6c 100644
---- a/tests/data_template/test_update/symbols.out
-+++ b/tests/data_template/test_update/symbols.out
-@@ -1,11 +1,5 @@
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--LIBTC3_1_1_0
--{
--    global:
--        new_symbol;
--} LIBTC3_1_0_0;
--
- LIBTC3_1_0_0
- {
-     global:
-@@ -15,3 +9,9 @@ LIBTC3_1_0_0
-         *;
- } ;
- 
-+LIBTC3_1_1_0
-+{
-+    global:
-+        new_symbol;
-+} LIBTC3_1_0_0;
-+
-diff --git a/tests/data_template/test_update/symbols_final.stdout b/tests/data_template/test_update/symbols_final.stdout
-index b4c1f0a..8ad56df 100644
---- a/tests/data_template/test_update/symbols_final.stdout
-+++ b/tests/data_template/test_update/symbols_final.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--LIBTC3_1_1_0    # Released
--{
--    global:
--        new_symbol;
--} LIBTC3_1_0_0;
--
- LIBTC3_1_0_0
- {
-     global:
-@@ -18,3 +12,9 @@ LIBTC3_1_0_0
-         *;
- } ;
- 
-+LIBTC3_1_1_0    # Released
-+{
-+    global:
-+        new_symbol;
-+} LIBTC3_1_0_0;
-+
-diff --git a/tests/data_template/test_update/symbols_sanity.stdout b/tests/data_template/test_update/symbols_sanity.stdout
-index 5d59b4a..9ef8ed2 100644
---- a/tests/data_template/test_update/symbols_sanity.stdout
-+++ b/tests/data_template/test_update/symbols_sanity.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--LIBTC3_1_1_0
--{
--    global:
--        new_symbol;
--} LIBTC3_1_0_0;
--
- LIBTC3_1_0_0
- {
-     global:
-@@ -18,3 +12,9 @@ LIBTC3_1_0_0
-         *;
- } ;
- 
-+LIBTC3_1_1_0
-+{
-+    global:
-+        new_symbol;
-+} LIBTC3_1_0_0;
-+
-diff --git a/tests/data_template/test_update/with_release_info.stdout b/tests/data_template/test_update/with_release_info.stdout
-index 1f8a82a..8b2c097 100644
---- a/tests/data_template/test_update/with_release_info.stdout
-+++ b/tests/data_template/test_update/with_release_info.stdout
-@@ -3,12 +3,6 @@ Added:
- 
- # This map file was updated with PROGRAM_NAME_VERSION
- 
--WITH_RELEASE_INFO_1_0_0
--{
--    global:
--        symbol;
--} BASE_1_0_0;
--
- BASE_1_0_0
- {
-     global:
-@@ -17,3 +11,9 @@ BASE_1_0_0
-         *;
- } ;
- 
-+WITH_RELEASE_INFO_1_0_0
-+{
-+    global:
-+        symbol;
-+} BASE_1_0_0;
-+
diff --git a/python-abimap.spec b/python-abimap.spec
index 5ab0361..07fa7bf 100644
--- a/python-abimap.spec
+++ b/python-abimap.spec
@@ -1,8 +1,8 @@
 %global module_name abimap
 
 Name:           python-%{module_name}
-Version:        0.3.0
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 License:        MIT
 Summary:        A helper for library maintainers to use symbol versioning
 Url:            https://github.com/ansasaki/abimap
@@ -11,7 +11,6 @@ Source:         https://files.pythonhosted.org/packages/source/a/%{module_name}/
 
 # This patch disables the test which depends on pytest-console-scripts
 Patch0:         python-abimap-0.3.0-disable-script-test.patch
-Patch1:         python-abimap-0.3.0-fix-releases-order.patch
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
@@ -25,7 +24,6 @@ BuildRequires:  %{py3_dist pyyaml}
 # BuildRequires:  %%{py3_dist pytest-console-scripts}
 # Required for documentation
 BuildRequires:  %{py3_dist sphinx}
-BuildRequires:  argparse-manpage
 
 Requires:       %{py3_dist setuptools}
 
@@ -59,22 +57,18 @@ rm -rf %{module_name}.egg-info
 %py3_build
 # Generate html docs
 PYTHONPATH=${PWD}/src:${PWD}/tests \
-    sphinx-build-3 docs html
+    sphinx-build-3 -E -b html docs html
+# Generate manpage
+PYTHONPATH=${PWD}/src:${PWD}/tests \
+    sphinx-build-3 -E -b man docs man
 # Remove the sphinx-build leftovers
 rm -rf html/.{doctrees,buildinfo}
-# Generate man page
-PYTHONPATH=${PWD}/src:${PWD}/tests \
-    argparse-manpage --module abimap.symver --function get_arg_parser \
-    --author "Anderson Sasaki" --author-email "ansasaki@redhat.com" \
-    --project-name abimap --url "https://github.com/ansasaki/abimap" \
-    > ${PWD}/docs/abimap.1
-    sed s/argparse-manpage/abimap/g -i ${PWD}/docs/abimap.1
 
 %install
 %py3_install
 # Install man page
 mkdir -p %{buildroot}%{_mandir}/man1
-cp ${PWD}/docs/abimap.1 %{buildroot}%{_mandir}/man1/abimap.1
+install ${PWD}/man/abimap.1 %{buildroot}%{_mandir}/man1/abimap.1
 
 %check
 # Generate test data (copied bootstrap-tests from Makefile)
@@ -97,6 +91,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib}:$PWD/tests \
 %doc html
 
 %changelog
+* Mon Aug 20 2018 Anderson Sasaki <ansasaki@redhat.com> - 0.3.1-1
+- Rebased to version 0.3.1
+- argparse-manpage is no longer required since manpage is generated by sphinx
+
 * Wed Aug 08 2018 Anderson Sasaki <ansasaki@redhat.com> - 0.3.0-2
 - Added Requires for setuptools
 - Addressed a bug in the order of releases in output map
diff --git a/sources b/sources
index cab75a8..182a5b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abimap-0.3.0.tar.gz) = 1fb9d36e8a828a8717a3a0dde2b57dba34ce89eb6d285c22f4bec498df9a7377bc0c5729306f266dd14cb10376774dc8149d7fc74866c03e5dab89527dc37024
+SHA512 (abimap-0.3.1.tar.gz) = 9f756fe743abad25ecc15bedc3cb3eb93729d2070c75ff83fee1b6655f0faf37e678f7234d84f034c98a1808e42f7089e4d82f5a77b1d4cd968a87808fcdc390