diff --git a/Arpeggio-1.6.1.tar.gz b/Arpeggio-1.6.1.tar.gz
deleted file mode 100644
index 6fbd241..0000000
--- a/Arpeggio-1.6.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4c55909b87d3ade568aff3cbd7795eb95ff646a869fe68e4a8a4de5f8a07cc3
-size 20427
diff --git a/Arpeggio-1.8.0.tar.gz b/Arpeggio-1.8.0.tar.gz
new file mode 100644
index 0000000..6461142
--- /dev/null
+++ b/Arpeggio-1.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:828ea85ca3c7a99125dc83000ca170c1ea1105c75cbf67a513c2e16e05e36f67
+size 20718
diff --git a/fix-setup-encoding.patch b/fix-setup-encoding.patch
new file mode 100644
index 0000000..2a3ea7d
--- /dev/null
+++ b/fix-setup-encoding.patch
@@ -0,0 +1,30 @@
+From a23376c03106779b75dc332b04b68deca57eca5a Mon Sep 17 00:00:00 2001
+From: Sebastian Wagner <sebix@sebix.at>
+Date: Sat, 7 Jul 2018 10:16:34 +0200
+Subject: [PATCH] Fix setup.py version read
+
+utf-8 encoding in environment was assumed
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2b17939..0e2d39f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -12,13 +12,14 @@
+ # Parsers are defined using python language construction or PEG language.
+ ###############################################################################
+ 
++import codecs
+ import os
+ import sys
+ from setuptools import setup
+ 
+ VERSIONFILE = "arpeggio/__init__.py"
+ VERSION = None
+-for line in open(VERSIONFILE, "r").readlines():
++for line in codecs.open(VERSIONFILE, "r", encoding='utf-8').readlines():
+     if line.startswith('__version__'):
+         VERSION = line.split('"')[1]
+ 
diff --git a/python-Arpeggio.changes b/python-Arpeggio.changes
index 8831e04..4165ce3 100644
--- a/python-Arpeggio.changes
+++ b/python-Arpeggio.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sat Jul  7 08:11:38 UTC 2018 - sebix+novell.com@sebix.at
+
+- add fix-setup-encoding.patch to fix setup.py encoding issue
+- update to version 1.8.0:
+ - Fixed issue #43.
+   *Backward incompatible change* for cleanpeg comment syntax.
+   Please see: https://github.com/igordejanovic/Arpeggio/issues/43
+ - Added `file` parser param used for `DebugPrinter` to allow the
+   output stream to be changed from stdout. This allows doctests to
+   continue to work. Thanks ianmmoir@GitHub.
+- update to version 1.7.1:
+ - Fixed bug in comment parsing optimization.
+- update to version 1.7:
+ - Added re_flag parameter to RegExMatch constructor. Thanks Aluriak@GitHub.
+ - Fix in grammar language docs. Thanks schmittlauch@GitHub.
+ - Small fixes in examples.
+
 -------------------------------------------------------------------
 Mon Aug 28 11:48:43 UTC 2017 - sebix+novell.com@sebix.at
 
diff --git a/python-Arpeggio.spec b/python-Arpeggio.spec
index 86b9d1d..cb6a94a 100644
--- a/python-Arpeggio.spec
+++ b/python-Arpeggio.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-Arpeggio
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,21 +13,24 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %bcond_without test
 Name:           python-Arpeggio
-Version:        1.6.1
+Version:        1.8.0
 Release:        0
-License:        MIT
 Summary:        Packrat parser interpreter
-Url:            http://igordejanovic.net/Arpeggio/
+License:        MIT
 Group:          Development/Languages/Python
+Url:            http://igordejanovic.net/Arpeggio/
 Source:         https://files.pythonhosted.org/packages/source/A/Arpeggio/Arpeggio-%{version}.tar.gz
-BuildRequires:  python-rpm-macros
+# PATCH-FIX-UPSTREAM fix-setup-encoding.patch
+Patch0:         https://github.com/igordejanovic/Arpeggio/pull/44.patch#/fix-setup-encoding.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  python-rpm-macros
 BuildArch:      noarch
 
 %python_subpackages
@@ -41,6 +44,7 @@ Arpeggio) see textX
 
 %prep
 %setup -q -n Arpeggio-%{version}
+%patch0 -p1
 
 %build
 %python_build