diff --git a/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf b/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
index aa657a978..c72315dfb 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
@@ -31,6 +31,7 @@ Import-Package: com.sun.awt,
  javax.xml.transform.stream,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.skin,
+ net.java.sip.communicator.util.wizard,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.keybindings,
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/wizard/EncodingsPanel.java b/src/net/java/sip/communicator/plugin/desktoputil/wizard/EncodingsPanel.java
index 97c9275d6..607008535 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/wizard/EncodingsPanel.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/wizard/EncodingsPanel.java
@@ -14,6 +14,7 @@
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.wizard.*;
 import net.java.sip.communicator.plugin.desktoputil.*;
 import org.jitsi.service.neomedia.*;
 import org.jitsi.service.neomedia.codec.*;
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java b/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java
index c569e776a..fcdadcf54 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java
@@ -17,6 +17,7 @@
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.wizard.*;
 import net.java.sip.communicator.plugin.desktoputil.*;
 
 import org.jitsi.service.neomedia.*;
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index f55306fc6..d0648b199 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -61,4 +61,5 @@ Export-Package: net.java.sip.communicator.util,
  net.java.sip.communicator.util.skin,
  net.java.sip.communicator.util.xml,
  net.java.sip.communicator.util.account,
- net.java.sip.communicator.util.call
\ No newline at end of file
+ net.java.sip.communicator.util.call,
+ net.java.sip.communicator.util.wizard
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/wizard/EncodingsRegistration.java b/src/net/java/sip/communicator/util/wizard/EncodingsRegistration.java
similarity index 94%
rename from src/net/java/sip/communicator/plugin/desktoputil/wizard/EncodingsRegistration.java
rename to src/net/java/sip/communicator/util/wizard/EncodingsRegistration.java
index fa3f2f4c8..7319f3ee8 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/wizard/EncodingsRegistration.java
+++ b/src/net/java/sip/communicator/util/wizard/EncodingsRegistration.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.desktoputil.wizard;
+package net.java.sip.communicator.util.wizard;
 
 import java.util.*;
 
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityAccountRegistration.java b/src/net/java/sip/communicator/util/wizard/SecurityAccountRegistration.java
similarity index 99%
rename from src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityAccountRegistration.java
rename to src/net/java/sip/communicator/util/wizard/SecurityAccountRegistration.java
index 4c88dedfc..506aa9047 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityAccountRegistration.java
+++ b/src/net/java/sip/communicator/util/wizard/SecurityAccountRegistration.java
@@ -3,7 +3,7 @@
  *
  * Distributable under LGPL license. See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.desktoputil.wizard;
+package net.java.sip.communicator.util.wizard;
 
 import net.java.sip.communicator.service.protocol.*;