diff --git a/.gitattributes b/.gitattributes
index 0a96144..32e277b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,4 +22,4 @@
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 ## Specific LFS patterns
-rshim-2.0.55.1.tar filter=lfs diff=lfs merge=lfs -text
+rshim-2.0.5.8.3.tar filter=lfs diff=lfs merge=lfs -text
diff --git a/_service b/_service
index b26030d..f17d5f7 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,8 @@
                 <param name="scm">git</param>
                 <param name="url">https://github.com/Mellanox/rshim-user-space.git</param>
                 <param name="filename">rshim</param>
-		<param name="versionrewrite-pattern">rshim(.*)</param>
+		<param name="versionrewrite-pattern">rshim-(.*)-(.*)</param>
+                <param name="versionrewrite-replacement">\1.\2</param>
 		<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param>
         </service>
         <service mode="disabled" name="set_version" />
diff --git a/rshim-2.0.5.8.3.tar b/rshim-2.0.5.8.3.tar
new file mode 100644
index 0000000..84b338f
--- /dev/null
+++ b/rshim-2.0.5.8.3.tar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f5c3436cd69b138ed738854efd194720de603158df01da9aa7ba7afa4187b35
+size 276480
diff --git a/rshim-2.0.55.1.tar b/rshim-2.0.55.1.tar
deleted file mode 100644
index 186f943..0000000
--- a/rshim-2.0.55.1.tar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97d17dda8e193f3c235dfc263dbf37a4a1bca01212b1ab3698b6f99c7c1f943c
-size 276480
diff --git a/rshim.changes b/rshim.changes
index 62d47c2..f9b09e7 100644
--- a/rshim.changes
+++ b/rshim.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jan 25 14:35:50 UTC 2021 - Matthias Brugger <mbrugger@suse.com>
+
+- fix _service file
+- update to 2.0.5.8.3
+  * fix various issues
+  * add workaround for Bluefield-2 REV-0
+
 -------------------------------------------------------------------
 Thu Nov 19 17:06:49 UTC 2020 - Matthias Brugger <mbrugger@suse.com>
 
diff --git a/rshim.spec b/rshim.spec
index 20d4109..a7853e3 100644
--- a/rshim.spec
+++ b/rshim.spec
@@ -18,7 +18,7 @@
 
 
 Name:           rshim
-Version:        2.0.55.1
+Version:        2.0.5.8.3
 Release:        0
 Summary:        User-space driver for Mellanox BlueField SoC
 License:        GPL-2.0-only