diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4f6ff988b1692329822f3bc7cbaf1490f1c0c2b..d0d4cca9e121de555f3b82d92eb8b75a2a7a2c7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,15 @@ project(macaon2)
 
 find_package(FLEX)
 
-# for gcc < 5.3
-#add_definitions("-Wall -std=gnu11" )
 add_definitions("-Wall" )
 
+if (${CMAKE_C_COMPILER_VERSION} VERSION_LESS 5.3)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
+	# better, but needs CMake >= 3.0
+	#set_property(GLOBAL PROPERTY CXX_STANDARD 11)
+	#set_property(GLOBAL PROPERTY C_STANDARD 11)
+endif()
+
 # activate with cmake -DMACA_EXPORT=TRUE 
 # to use macaon in python/java (with swig)
 if(MACA_EXPORT)
diff --git a/INSTALL b/INSTALL
index f031c1e9cb5a162913d80aa8cdbc7cf557486a6c..7fe96bf8ad3a5849a7d8b5da8f2e7f2bf36b5f46 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,8 +16,15 @@ The basic procedure to build and install macaon from sources is the following.
   If you want to install macaon locally, you can specify the install path with :
     cmake -DCMAKE_INSTALL_PREFIX:PATH=/absolute/path/to/macaon_install_dir ..
 
-  If you want to create a library to use in python
+  If you want to create a library to use in python or java
     cmake -DMACA_EXPORT=TRUE ..
+  you need to install the following packages on Ubuntu
+	sudo apt-get install swig
+	sudo apt-get install libpython2.7-dev
+
+	sudo apt-get install openjdk-8-jdk 
+     or
+	sudo apt-get install openjdk-7-jdk 
 
 - Build the sources with:
     make
diff --git a/maca_export/CMakeLists.txt b/maca_export/CMakeLists.txt
index d9a505059c5c5def347a4001b7625983c9c95707..8ba50a4640cc14b73c305bb2c28270f9a1bb6cd8 100644
--- a/maca_export/CMakeLists.txt
+++ b/maca_export/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 if(MACA_EXPORT)
-  FIND_PACKAGE(SWIG 3.0)
+  FIND_PACKAGE(SWIG)
   if (SWIG_FOUND)
     FIND_PACKAGE(PythonLibs)
 
@@ -37,7 +37,7 @@ if(MACA_EXPORT)
 
     FIND_PACKAGE(Java 1.7)
     FIND_PACKAGE(JNI)
-    if (JNI_FOUND AND Java_FOUND)
+    if (JNI_FOUND AND (Java_FOUND OR JAVA_FOUND))
       set(JAVA_MODULE_NAME Macaon)
       set(JAVA_LIBRARY MacaonJava)
       set(JAVA_CLASS_TAGGER MacaonTransTagger)