diff --git a/README.md b/README.md
index 0bfcb5e..423edb8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # jchempaint
 
-JChemPaint is an editor for 2D molecular structures
+JChemPaint is an editor for 2D molecular structures.
 
diff --git a/jchem.png b/jchem.png
deleted file mode 100644
index e21153f..0000000
Binary files a/jchem.png and /dev/null differ
diff --git a/jchempaint.desktop b/jchempaint.desktop
new file mode 100644
index 0000000..d9f7ae9
--- /dev/null
+++ b/jchempaint.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=JChemPaint
+GenericName=2D Chemistry Drawing
+GenericName[it]=Editor di strutture molecolari in 2D
+Exec=/usr/bin/jchempaint
+Icon=jchempaint %u
+Categories=Science;Chemistry;Education
diff --git a/jchempaint.sh b/jchempaint.sh
new file mode 100644
index 0000000..269285e
--- /dev/null
+++ b/jchempaint.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/java -jar '/usr/share/java/jchempaint.jar' "\$@"
diff --git a/jchempaint.spec b/jchempaint.spec
index 09139a1..e6a4792 100644
--- a/jchempaint.spec
+++ b/jchempaint.spec
@@ -1,65 +1,55 @@
+%define gitver %(echo %version | tr _ -)
 Name:          jchempaint
-Version:       2.0.12
-Release:       1qilnx
+Version:       3.3_1210
+Release:       1mamba
 Summary:       JChemPaint is an editor for 2D molecular structures
 Group:         Graphical Desktop/Applications/Educational
-Vendor:        QiLinux
-Distribution:  QiLinux
-Packager:      Alessandro Ramazzina <alessandro.ramazzina@qilinux.it>
-URL:           http://almost.cubic.uni-koeln.de/cdk/jcp
-Source:        http://switch.dl.sourceforge.net/sourceforge/jchempaint/%{name}-%{version}.source.tar.gz
-Source1:       jchem.png
+Vendor:        openmamba
+Distribution:  openmamba
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           https://almost.cubic.uni-koeln.de/cdk/jcp
+Source:        https://github.com/downloads/JChemPaint/jchempaint/jchempaint-%{gitver}.jar
+Source1:       jchempaint.desktop
+Source2:       jchempaint.sh
 License:       LGPL
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+## AUTOBUILDREQ-BEGIN
+## AUTOBUILDREQ-END
+BuildRequires: javapackages
+BuildRequires: ImageMagick
+Requires:      java-runtime
 
 %description
-JChemPaint is an editor for 2D molecular structures
+JChemPaint is an editor for 2D molecular structures.
 
 %prep
-%setup -q 
+%setup -q -c -T
+jar -xf %{SOURCE0} org/openscience/jchempaint/resources/large-bin/icon_32x32.gif
 
 %build
-JAVA_HOME=/usr/java/j2sdk1.4 ant
-
+mv org/openscience/jchempaint/resources/large-bin/icon_32x32.gif jchempaint.gif
+convert jchempaint.gif jchempaint.png
+	
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/usr/lib
-mkdir -p %{buildroot}/usr/share/%{name}-%{version}/doc/
-install -m 755 jchempaint-2.0.12.jar %{buildroot}/usr/lib
-cp -r doc/* %{buildroot}/usr/share/%{name}-%{version}/doc/
-
-#Icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/jchem.png
-
-# Create the system menu entry
-mkdir -p %{buildroot}%{_datadir}/applnk/Edutainment/Science
-cat > %{buildroot}%{_datadir}/applnk/Edutainment/Science/%{name}.desktop << EOF
-[Desktop Entry]
-Name=%{name}
-GenericName=JChemPaint is an editor for 2D molecular structures.
-GenericName[it]=editor di strutture molecolari in 2d.
-Comment=JChemPaint is an editor for 2D molecular structures.
-Exec=java -jar %{_libdir}/jchempaint-2.0.12.jar
-Icon=%{_datadir}/pixmaps/jchem.png
-Terminal=0
-Type=Application
-X-KDE-StartupNotify=false
-EOF
+install -D -m0755 %{SOURCE0} %{buildroot}%{_javadir}/jchempaint.jar
+install -D -m0755 %{SOURCE2} %{buildroot}%{_bindir}/jchempaint
+install -D -m0644 jchempaint.png %{buildroot}%{_datadir}/pixmaps/jchempaint.png
+install -D -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/jchempaint.desktop
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc README.txt
-%{_libdir}/jchempaint-2.0.12.jar
-%{_datadir}/applnk/Edutainment/Science/jchempaint.desktop
-%dir %{_datadir}/jchempaint-2.0.12/doc
-%{_datadir}/jchempaint-2.0.12/doc/*
-%{_datadir}/pixmaps/jchem.png
+%{_bindir}/jchempaint
+%{_javadir}/jchempaint.jar
+%{_datadir}/applications/jchempaint.desktop
+%{_datadir}/pixmaps/jchempaint.png
 
 %changelog
+* Sun Apr 11 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.3_1210-1mamba
+- update to 3.3_1210
+
 * Mon Jul 25 2005 Alessandro Ramazzina <alessandro.ramazzina@qilinux.it> 2.0.12-1qilnx
 - package created by autospec