diff --git a/README.packager b/README.packager
deleted file mode 100644
index 0b77ec0..0000000
--- a/README.packager
+++ /dev/null
@@ -1,18 +0,0 @@
-# Heavily based on https://build.opensuse.org/package/view_file/devel:languages:rust/racer/README.packager (Thank you for this!)
-#
-# Generating `vendor.tar.xz`
-
-1. Install `cargo` from official repositories.
-
-    zypper install cargo
-
-2. Checkout version
-
-    git clone https://github.com/sharkdp/bat ~/tmp/bat
-    cd ~/tmp/bat
-    git checkout v0.10.0 (or another version from `git tag --list`)
-
-3. Generate archive
-
-    cargo vendor
-    tar -cJf vendor.tar.xz vendor
diff --git a/_service b/_service
new file mode 100644
index 0000000..3580822
--- /dev/null
+++ b/_service
@@ -0,0 +1,25 @@
+<services>
+  <service name="format_spec_file" mode="manual">
+  </service>
+  <service name="obs_scm" mode="localonly">
+    <param name="scm">git</param>
+    <param name="url">git://github.com/sharkdp/bat</param>
+    <param name="revision">v0.18.1</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">enable</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+  </service>
+  <service mode="localonly" name="set_version">
+  </service>
+  <service name="tar" mode="localonly"/>
+  <service name="recompress" mode="localonly">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="cargo_audit" mode="localonly">
+     <param name="srcdir">bat</param>
+  </service>
+  <service name="cargo_vendor" mode="localonly">
+    <param name="srcdir">bat</param>
+  </service>
+</services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..ee24097
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">git://github.com/sharkdp/bat</param>
+              <param name="changesrevision">f827ed338bf5702d7f755e57648e7336492e886a</param></service></servicedata>
\ No newline at end of file
diff --git a/bat-0.18.0.tar.gz b/bat-0.18.0.tar.gz
deleted file mode 100644
index ce0a6d6..0000000
--- a/bat-0.18.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49d1b95250050df47753c213b5e48953a029c9e74753cef371051b14c9d629b8
-size 1329827
diff --git a/bat-0.18.1.tar.xz b/bat-0.18.1.tar.xz
new file mode 100644
index 0000000..8cbe3b1
--- /dev/null
+++ b/bat-0.18.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22bc0a93b6cb47d311939d9a38c9e9b366ae50a3e4ef35e040e455c8cc1530df
+size 50719448
diff --git a/bat.changes b/bat.changes
index 9c0be62..404b05b 100644
--- a/bat.changes
+++ b/bat.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Sun Jun 13 19:33:37 UTC 2021 - idesmi@protonmail.com
+
+- Update to version 0.18.1:
+  * Update binary assets
+  * Bump version, update dependencies
+  * Updated CHANGELOG
+  * Bump assets/syntaxes/02_Extra/Lean from `824213d` to `29a03a8`
+  * Bump serde from 1.0.124 to 1.0.125
+  * Bump bugreport from 0.3.0 to 0.4.0
+  * Bump assets/syntaxes/02_Extra/FSharp from `c18616d` to `9e4645c`
+  * add warning highlighting to log file syntax definition
+  * add word boundaries to log syntax highlighting
+  * Add independent log syntax
+  * improve syslog syntax
+  * replace Syslog dependency with a custom syntax
+  * add example syslog file for highlighting tests
+  * Revert "Update of themes.bin that adds Dark+"
+  * Update of themes.bin that adds Dark+
+  * Add "Visual Studio Dark+" theme to vec of themes
+  * Add Dark+ theme
+
 -------------------------------------------------------------------
 Thu Mar 25 12:02:19 UTC 2021 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/bat.spec b/bat.spec
index f7d4e7f..8cc408e 100644
--- a/bat.spec
+++ b/bat.spec
@@ -17,22 +17,17 @@
 
 
 Name:           bat
-Version:        0.18.0
+Version:        0.18.1
 Release:        0
 Summary:        A cat(1) clone with syntax highlighting and Git integration
 License:        Apache-2.0 OR MIT
 Group:          Productivity/Text/Utilities
-URL:            https://github.com/sharkdp/bat
-Source0:        https://github.com/sharkdp/bat/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL:            https://github.com/sharkdp/%{name}
+Source0:        %{name}-%{version}.tar.xz
 Source1:        vendor.tar.xz
-# Instructions on how to generate vendor.tar.xz
-Source2:        README.packager
-BuildRequires:  cargo
-BuildRequires:  clang
-BuildRequires:  cmake
-BuildRequires:  rust
-BuildRequires:  rust-std
-BuildRequires:  zlib-devel
+BuildRequires:  rust >= 1.45
+BuildRequires:  rust-packaging
+ExclusiveArch:  %{rust_arches}
 
 %description
 A cat(1) clone which supports syntax highlighting for a large number of
@@ -40,24 +35,24 @@ programming and markup languages. It has git integration and automatic paging.
 
 %prep
 %setup -qa1
-mkdir .cargo
-cat >.cargo/config <<EOF
-[source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
-replace-with = 'vendored-sources'
-[source.vendored-sources]
-directory = './vendor'
-EOF
+%define cargo_registry $(pwd)/vendor
+%{cargo_prep}
 
 %build
-cargo build --release --locked %{?_smp_mflags}
+export CARGO_NET_OFFLINE=true
+%{cargo_build}
 
 %install
-cargo install --no-track --root=%{buildroot}%{_prefix} --path .
+install -D -m 0755 target/release/%{name} %{buildroot}%{_bindir}/%{name}
+
+%if %{with check}
+%check
+%{cargo_test}
+%endif
 
 %files
-%doc README.md
+%doc README.md CONTRIBUTING.md CHANGELOG.md
 %license LICENSE-MIT LICENSE-APACHE
-%{_bindir}/bat
+%{_bindir}/%{name}
 
 %changelog
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 14d3ead..2fc59bf 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a31c330d40d2ac55b0e4fb417f2e976e10349fc3d0d3b99b0a74783c04534877
-size 11587172
+oid sha256:e80ed8429bfc4ca131a471a5ba0f91bc0dc54b9c8ac634be4173f7e47b8bf1e4
+size 11527872