diff --git a/.gitignore b/.gitignore
index 8479d8c..a727f45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /AMF-1.4.23.tar.gz
+/AMF-cleaned-1.4.23.tar.gz
diff --git a/AMF-tarball.sh b/AMF-tarball.sh
new file mode 100755
index 0000000..9f49eca
--- /dev/null
+++ b/AMF-tarball.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [[ -z "$1" ]]; then
+    echo "Usage: $0 <version>" 1>&2
+    exit 1
+fi
+
+VERSION=$1
+NAME=AMF
+
+wget -q -c https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/v$VERSION/$NAME-$VERSION.tar.gz
+
+tar -xzf $NAME-$VERSION.tar.gz
+rm -f $NAME-$VERSION.tar.gz
+rm -fr $NAME-$VERSION/Thirdparty
+
+tar -czf $NAME-cleaned-$VERSION.tar.gz --remove-files $NAME-$VERSION
diff --git a/AMF.spec b/AMF.spec
index 81f09e2..37da3b9 100644
--- a/AMF.spec
+++ b/AMF.spec
@@ -1,12 +1,14 @@
 Name:           AMF
 Version:        1.4.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced Media Framework (AMF) SDK
 License:        MIT
 URL:            https://gpuopen.com/advanced-media-framework/
 BuildArch:      noarch
 
-Source0:        https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/v%{version}/%{name}-%{version}.tar.gz
+# Cleaned up tarballi without Thirdparty folder:
+Source0:        %{name}-cleaned-%{version}.tar.gz
+Source1:        %{name}-tarball.sh
 
 %description
 A light-weight, portable multimedia framework that abstracts away most of the
@@ -49,9 +51,12 @@ ln -sf ../../include/AMF %{buildroot}%{_usrsrc}/%{name}/include
 %{_includedir}/%{name}/
 
 %files samples
-%doc amf/doc/*
 %{_usrsrc}/%{name}
 
 %changelog
+* Sun Feb 13 2022 Simone Caronni <negativo17@gmail.com> - 1.4.23-2
+- Remove Thirdparty folder from sources and provide script to recreate tarball.
+- Remove duplicated docs in samples subpackage.
+
 * Thu Feb 10 2022 Simone Caronni <negativo17@gmail.com> - 1.4.23-1
 - First build.
diff --git a/sources b/sources
index 919be8e..019454c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (AMF-1.4.23.tar.gz) = 98b2b7d634ac24be5c5234fad99d58c9668b2dab83e89162a0508f9b06efec5de29b307534dc1dd677f9586be2c4fa58c8f04a535d5e66fa0be3b233a117a5d7
+SHA512 (AMF-cleaned-1.4.23.tar.gz) = c3d590d4916bc4e39459cb5fca5f03b6964f75177caa15c28abaf0d48c0c24ad73f8ef1200049e34531d6649c411ea0b5163f87579d0097d14c006493a79170f