diff --git a/flexdock-0003-java-1.8.patch b/flexdock-0003-java-1.8.patch
new file mode 100644
index 0000000..181c5d4
--- /dev/null
+++ b/flexdock-0003-java-1.8.patch
@@ -0,0 +1,24 @@
+diff --git a/build.xml b/build.xml
+index fbd64c6..ff71b27 100644
+--- a/build.xml
++++ b/build.xml
+@@ -111,7 +111,7 @@
+ 
+    <target name="compile" depends="init, resources"
+            description="Compile java sources for the framework, demos, and tests">
+-      <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.5" target="1.5" includeAntRuntime="no">
++      <javac classpathref="javac.classpath" destdir="${bin.dir}" debug="true" source="1.8" target="1.8" includeAntRuntime="no">
+          <compilerarg value="-Xlint"/>
+          <src path="${java.src.core}" />
+          <!-- the next 3 are interdependent -->
+@@ -121,8 +121,8 @@
+          <src path="${java.src.drag}"/>
+          <src path="${java.src.perspective}"/>
+       </javac>
+-      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.5" target="1.5" includeAntRuntime="no"/>
+-      <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.5" target="1.5"  includeAntRuntime="no"/>
++      <javac classpathref="javac.classpath.demo" srcdir="${java.src.demo}" destdir="${bin.dir.demo}" debug="true" source="1.8" target="1.8" includeAntRuntime="no"/>
++      <javac classpathref="javac.classpath.test" srcdir="${java.src.test}" destdir="${bin.dir.test}" debug="true" source="1.8" target="1.8"  includeAntRuntime="no"/>
+    </target>
+ 
+ 
diff --git a/flexdock.spec b/flexdock.spec
index 231301c..b1e1a8f 100644
--- a/flexdock.spec
+++ b/flexdock.spec
@@ -1,6 +1,6 @@
 Name:		    flexdock
 Version:        1.2.4
-Release:	    12%{?dist}
+Release:	    13%{?dist}
 Summary:	    Docking framework for Java Swing GUI apps
 
 
@@ -14,6 +14,8 @@ Source0:	    http://forge.scilab.org/index.php/p/flexdock/downloads/get/%{name}-
 Patch1:		    flexdock-0001-nojmf.patch
 #Modifies the build process  -- fedora specific
 Patch2:		    flexdock-0002-fedora-build.patch
+#Set javac source and target version to 1.8 to fix builds with Java 11
+Patch3:         flexdock-0003-java-1.8.patch
 
 BuildRequires:	java-devel
 BuildRequires:	ant
@@ -39,6 +41,7 @@ Swing applications.
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 #Override the build file's default hard-coded paths
 echo "sdk.home=%{java_home}" > workingcopy.properties
@@ -69,6 +72,9 @@ install -pm644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 %{_javadir}/*
 
 %changelog
+* Sun Jul 19 2020 Fabio Valentini <decathorpe@gmail.com> - 1.2.4-13
+- Set javac source and target to 1.8 to fix Java 11 builds.
+
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.2.4-12
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11