diff --git a/lutin/z_system/lutinSystem_Linux_egl.py b/lutin/z_system/lutinSystem_Linux_egl.py
new file mode 100644
index 0000000..186f611
--- /dev/null
+++ b/lutin/z_system/lutinSystem_Linux_egl.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+##
+## @author Edouard DUPIN
+##
+## @copyright 2012, Edouard DUPIN, all right reserved
+##
+## @license MPL v2.0 (see license file)
+##
+
+from lutin import debug
+from lutin import system
+from lutin import tools
+from lutin import env
+import os
+
+class System(system.System):
+	def __init__(self, target):
+		system.System.__init__(self)
+		# create some HELP:
+		self.set_help("OpenGL: Generic graphic library")
+		self.set_valid(True)
+		# no check needed ==> just add this:
+		self.add_depend([
+		    'khr',
+		    ])
+		self.add_flag('link-lib', 'EGL')
+		if env.get_isolate_system() == True:
+			self.add_header_file([
+			    "/usr/include/EGL/*"
+			    ],
+			    destination_path="EGL",
+			    recursive=True)
+	
+
+
diff --git a/lutin/z_system/lutinSystem_Linux_gles2.py b/lutin/z_system/lutinSystem_Linux_gles2.py
new file mode 100644
index 0000000..1df4fb5
--- /dev/null
+++ b/lutin/z_system/lutinSystem_Linux_gles2.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+##
+## @author Edouard DUPIN
+##
+## @copyright 2012, Edouard DUPIN, all right reserved
+##
+## @license MPL v2.0 (see license file)
+##
+
+from lutin import debug
+from lutin import system
+from lutin import tools
+from lutin import env
+import os
+
+class System(system.System):
+	def __init__(self, target):
+		system.System.__init__(self)
+		# create some HELP:
+		self.set_help("OpenGL: Generic graphic library")
+		self.set_valid(True)
+		# no check needed ==> just add this:
+		self.add_depend([
+		    'opengl',
+		    ])
+		self.add_flag('link-lib', 'GLESv2')
+		if env.get_isolate_system() == True:
+			self.add_header_file([
+			    "/usr/include/GLES2/*"
+			    ],
+			    destination_path="GLES2",
+			    recursive=True)
+	
+
+
diff --git a/lutin/z_system/lutinSystem_Linux_khr.py b/lutin/z_system/lutinSystem_Linux_khr.py
new file mode 100644
index 0000000..170952b
--- /dev/null
+++ b/lutin/z_system/lutinSystem_Linux_khr.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+##
+## @author Edouard DUPIN
+##
+## @copyright 2012, Edouard DUPIN, all right reserved
+##
+## @license MPL v2.0 (see license file)
+##
+
+from lutin import debug
+from lutin import system
+from lutin import tools
+from lutin import env
+import os
+
+class System(system.System):
+	def __init__(self, target):
+		system.System.__init__(self)
+		# create some HELP:
+		self.set_help("OpenGL: Generic graphic library")
+		self.set_valid(True)
+		# no check needed ==> just add this:
+		self.add_depend([
+		    'c',
+		    ])
+		self.add_flag('link-lib', 'wayland-egl')
+		if env.get_isolate_system() == True:
+			self.add_header_file([
+			    "/usr/include/KHR/*"
+			    ],
+			    destination_path="KHR",
+			    recursive=True)
+	
+
+
diff --git a/lutin/z_system/lutinSystem_Linux_opengl.py b/lutin/z_system/lutinSystem_Linux_opengl.py
index 40ccd68..ef5b492 100644
--- a/lutin/z_system/lutinSystem_Linux_opengl.py
+++ b/lutin/z_system/lutinSystem_Linux_opengl.py
@@ -23,7 +23,6 @@ class System(system.System):
 		# no check needed ==> just add this:
 		self.add_depend([
 		    'c',
-		    'X11'
 		    ])
 		self.add_flag('link-lib', 'GL')
 		if env.get_isolate_system() == True:
diff --git a/lutin/z_system/lutinSystem_Linux_wayland.py b/lutin/z_system/lutinSystem_Linux_wayland.py
new file mode 100644
index 0000000..a065ef0
--- /dev/null
+++ b/lutin/z_system/lutinSystem_Linux_wayland.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+##
+## @author Edouard DUPIN
+##
+## @copyright 2012, Edouard DUPIN, all right reserved
+##
+## @license MPL v2.0 (see license file)
+##
+
+from lutin import debug
+from lutin import system
+from lutin import tools
+from lutin import env
+import os
+
+class System(system.System):
+	def __init__(self, target):
+		system.System.__init__(self)
+		# create some HELP:
+		self.set_help("wayland: Basic interface of Linux Graphic interface (replace X11)")
+		self.set_valid(True)
+		# no check needed ==> just add this:
+		self.add_depend(['c'])
+		self.add_flag('link-lib', 'wayland-client')
+		if env.get_isolate_system() == True:
+			self.add_header_file([
+			    "/usr/include/wayland-*"
+			    ],
+			    destination_path="",
+			    recursive=True)
+
+
diff --git a/setup.py b/setup.py
index ad4dc91..ae2872a 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup(name='lutin',
                 'lutin/z_system',
                 'lutin/z_target'],
       classifiers=[
-        'Development Status :: 5 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
         'Programming Language :: Python',
         'Topic :: Software Development :: Compilers',