diff --git a/.gitignore b/.gitignore
index 6d44f4e..4f42867 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
 /xpra-4.0.4.tar.xz
 /xpra-4.0.5.tar.xz
 /xpra-4.0.6.tar.xz
+/xpra-4.1.tar.gz
diff --git a/sources b/sources
index 3d45319..48bd59b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-4.0.6.tar.xz) = e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
+SHA512 (xpra-4.1.tar.gz) = 9f7fb17bf05aa265976f4815279368993057a59fc58bb8cf74843419affaae429f6cedfe692c6daaa5a085f3aada2ce3f145667bef0b277faa610895ec26a5bf
diff --git a/xpra.spec b/xpra.spec
index b53d2f7..055a9df 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -38,12 +38,12 @@
 %endif
 
 Name:           xpra
-Version:        4.0.6
-Release:        3%{?dist}
+Version:        4.1
+Release:        1%{?dist}
 Summary:        Remote display server for applications and desktops
 License:        GPLv2+ and BSD and LGPLv3+ and MIT
 URL:            https://www.xpra.org/
-Source0:        https://xpra.org/src/%{name}-%{version}.tar.xz
+Source0:        https://github.com/Xpra-org/xpra/archive/v%{version}/%{name}-%{version}.tar.gz
 
 # Appdata file for Fedora
 Source1:        %{name}.appdata.xml
@@ -79,6 +79,11 @@ BuildRequires:  cups-devel, cups
 BuildRequires:  redhat-lsb-core
 BuildRequires:  gcc
 BuildRequires:  pam-devel
+BuildRequires:  pandoc
+BuildRequires:  xorg-x11-server-Xorg
+BuildRequires:  xorg-x11-drv-dummy
+BuildRequires:  xorg-x11-xauth
+BuildRequires:  xkbcomp, setxkbmap
 %if %{with debug}
 BuildRequires: libasan
 %endif
@@ -122,6 +127,9 @@ Requires: js-jquery
 # Needed to create the xpra group
 Requires(pre):  shadow-utils
 
+# xpra-html5 is now separately provided 
+Obsoletes: xpra-html5 < 0:4.1-1
+
 %description
 Xpra is "screen for X": it allows you to run X programs, usually on a remote
 host, direct their display to your local machine, and then to disconnect from
@@ -134,22 +142,6 @@ Sessions can be accessed over SSH, or password protected over plain TCP sockets.
 Xpra is usable over reasonably slow links and does its best to adapt to changing
 network bandwidth constraints.
 
-%package html5
-Summary:        HTML5 server and client support for xpra
-License:        MPLv2.0
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
-Provides:       bundled(js-jquery-ui) = 1.12.1
-Provides:       bundled(js-lz4)
-Provides:       bundled(js-zlib)
-Provides:       bundled(js-forge)
-Provides:       bundled(js-aurora)
-Provides:       bundled(js-broadway)
-Provides:       bundled(js-bencode)
-
-%description html5
-HTML5 server and client support for xpra.
-
 %package udev
 Summary:  xpra udev files
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -185,7 +177,7 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo"
     %{?_with_debug} \
     --with-Xdummy \
     --with-Xdummy_wrapper \
-    --with-html5_gzip --without-html5_brotli --without-strict
+    --without-strict
 
 %install
 %{__python3} setup.py install -O1 \
@@ -199,8 +191,7 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo"
     %{?_with_debug} \
     --with-Xdummy \
     --with-Xdummy_wrapper \
-    --with-html5_gzip --without-html5_brotli --without-strict
-
+    --without-strict
 
 # Installation of these service files is not permitted on Fedora
 # See https://pagure.io/fesco/issue/1759
@@ -215,10 +206,10 @@ mv %{buildroot}%{_datadir}/icons/xpra.png \
     %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
 
 rm -f %{buildroot}%{_datadir}/icons/xpra-mdns.png
-install -pm 644 xdg/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+install -pm 644 fs/share/icons/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 rm -f %{buildroot}%{_datadir}/icons/xpra-shadow.png
-install -pm 644 xdg/xpra-shadow.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+install -pm 644 fs/share/icons/xpra-shadow.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
 
 #replace old file with horrible WindowsXP old image
 rm -rf %{buildroot}%{_datadir}/appdata
@@ -227,7 +218,7 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_metainfodir}/
 
 #Install nvenc.keys file
 mkdir -p %{buildroot}%{_sysconfdir}/xpra
-install -pm 644 etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra
+install -pm 644 fs/etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra
 
 #remove doc stuff from /usr/share
 rm -f \
@@ -235,12 +226,11 @@ rm -f \
     %{buildroot}%{_datadir}/xpra/COPYING
 
 #fix shebangs from python3_sitearch
-pushd %{buildroot}%{python3_sitearch}/xpra
-find . -name '*.py' | xargs pathfix.py -pn -i "%{__python3}"
+find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs pathfix.py -pn -i "%{__python3}"
+find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs chmod 0755
 for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do
     chmod 0755 $i
 done
-popd
 
 #fix permissions on shared objects
 pushd %{buildroot}%{python3_sitearch}/xpra
@@ -252,12 +242,6 @@ popd
 # guidelines
 find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \;
 
-# Ensure all .js files are not executable
-find %{buildroot}%{_datadir}/xpra/www/js -name '*.js' \
-    -exec chmod 0644 {} \;
-
-ln -sf %{__js_jquery_latest}jquery.js %{buildroot}%{_datadir}/xpra/www/js/lib/jquery.js
-
 # Create this directory for sharing sockets
 mkdir -p %{buildroot}%{_rundir}/xpra
 
@@ -270,6 +254,11 @@ for i in `find %{buildroot}%{_bindir} -perm /644 -type f \( -name "*" \)`; do
     chmod 0755 $i
 done
 
+# Remove Build documentation
+rm -rf %{buildroot}%{_docdir}/xpra/Build
+
+install -pm 644 README.md %{buildroot}%{_docdir}/xpra/
+
 %check
 %{?fedora:appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml}
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
@@ -278,7 +267,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 getent group xpra >/dev/null || groupadd -r xpra
 
 %files
-%doc README NEWS
 %license COPYING
 %dir %{_sysconfdir}/xpra
 %dir %{_sysconfdir}/xpra/conf.d
@@ -289,9 +277,17 @@ getent group xpra >/dev/null || groupadd -r xpra
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/xpra
 %config(noreplace) %{_sysconfdir}/pam.d/xpra
+%config(noreplace) %{_sysconfdir}/xpra/content-categories/10_default.conf
+%config(noreplace) %{_sysconfdir}/xpra/content-type/10_role.conf
+%config(noreplace) %{_sysconfdir}/xpra/content-type/30_title.conf
+%config(noreplace) %{_sysconfdir}/xpra/content-type/50_class.conf
+%config(noreplace) %{_sysconfdir}/xpra/content-type/70_commands.conf
+%config(noreplace) %{_sysconfdir}/xpra/http-headers/00_nocache.txt
+%config(noreplace) %{_sysconfdir}/xpra/http-headers/10_content_security_policy.txt
 %{_libexecdir}/xpra/
 %{_bindir}/xpra
 %{_bindir}/xpra_*
+%{_bindir}/run_scaled
 %{_sysusersdir}/*.conf
 %{python3_sitearch}/xpra/
 %{python3_sitearch}/*.egg-info
@@ -301,22 +297,23 @@ getent group xpra >/dev/null || groupadd -r xpra
 %{_datadir}/icons/hicolor/64x64/apps/xpra.png
 %{_mandir}/man1/xpra.1.*
 %{_mandir}/man1/xpra_*.1.*
+%{_mandir}/man1/run_scaled.1.*
 %{_metainfodir}/xpra.appdata.xml
 %{_datadir}/mime/packages/application-x-xpraconfig.xml
 %{_datadir}/xpra/
 %{cupslibdir}/backend/xpraforwarder
 %{_tmpfilesdir}/xpra.conf
 %dir %{_rundir}/xpra
+%{_pkgdocdir}/
 
 %files udev
 %{_bindir}/xpra_udev_product_version
 %{_udevrulesdir}/71-xpra-virtual-pointer.rules
 
-%files html5
-%license html5/LICENSE
-%{_datadir}/xpra/www
-
 %changelog
+* Mon Mar 01 2021 Antonio Trande <sagitter@fedoraproject.org> - 4.1-1
+- Release 4.1
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild