diff --git a/src/org/dclermonte/siba/Siba.java b/src/org/dclermonte/siba/Siba.java
index 7e6b7f4..588018b 100644
--- a/src/org/dclermonte/siba/Siba.java
+++ b/src/org/dclermonte/siba/Siba.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  *
  *
  */
-public class Siba
+public final class Siba
 {
 	private static Logger logger = LoggerFactory.getLogger(Siba.class);
 
diff --git a/src/org/dclermonte/siba/cli/SibaCLI.java b/src/org/dclermonte/siba/cli/SibaCLI.java
index 3714237..c52403b 100644
--- a/src/org/dclermonte/siba/cli/SibaCLI.java
+++ b/src/org/dclermonte/siba/cli/SibaCLI.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  *
  *
  */
-public class SibaCLI
+public final class SibaCLI
 {
 	private static Logger logger = LoggerFactory.getLogger(SibaCLI.class);
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.cli.messages"); //$NON-NLS-1$
diff --git a/src/org/dclermonte/siba/gui/SibaGUI.java b/src/org/dclermonte/siba/gui/SibaGUI.java
index 6bb03e4..2102686 100644
--- a/src/org/dclermonte/siba/gui/SibaGUI.java
+++ b/src/org/dclermonte/siba/gui/SibaGUI.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
  * @author dclermonte
  *
  */
-public class SibaGUI
+public final class SibaGUI
 {
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$
 	public static Logger logger = LoggerFactory.getLogger(SibaGUI.class);
diff --git a/src/org/dclermonte/siba/gui/utils/GUIToolBox.java b/src/org/dclermonte/siba/gui/utils/GUIToolBox.java
index a69e6be..4536731 100644
--- a/src/org/dclermonte/siba/gui/utils/GUIToolBox.java
+++ b/src/org/dclermonte/siba/gui/utils/GUIToolBox.java
@@ -30,7 +30,7 @@ import javax.swing.UIManager;
  * @author dclermonte
  *
  */
-public class GUIToolBox
+public final class GUIToolBox
 {
 	private GUIToolBox()
 	{
diff --git a/src/org/dclermonte/siba/model/SibaManager.java b/src/org/dclermonte/siba/model/SibaManager.java
index 67c2145..c46a3bc 100644
--- a/src/org/dclermonte/siba/model/SibaManager.java
+++ b/src/org/dclermonte/siba/model/SibaManager.java
@@ -40,7 +40,7 @@ import org.dclermonte.siba.SibaException;
  * @author Didier Clermonté (dclermonte@april.org)
  *
  */
-public class SibaManager
+public final class SibaManager
 {
 	private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.model.messages"); //$NON-NLS-1$
 
diff --git a/src/org/dclermonte/siba/model/SibaUtils.java b/src/org/dclermonte/siba/model/SibaUtils.java
index 69ec30f..9fe7b44 100644
--- a/src/org/dclermonte/siba/model/SibaUtils.java
+++ b/src/org/dclermonte/siba/model/SibaUtils.java
@@ -38,7 +38,7 @@ import org.apache.commons.io.IOUtils;
  * @author Didier Clermonté (dclermonte@april.org)
  *
  */
-public class SibaUtils
+public final class SibaUtils
 {
 	static final String DEFAULT_CHARSET = "UTF-8";