diff --git a/build.xml b/build.xml
index 4346d9263..5b8fd9d85 100644
--- a/build.xml
+++ b/build.xml
@@ -765,7 +765,6 @@
             <!--sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
                     value="${user.home}"/-->
 
-
             <!-- Setting properties necessary for dependencies on native libs.-->
             <sysproperty key="java.library.path"
                 path="${ld.library.path}:${path}:${dyld.library.path}"/>
@@ -875,6 +874,7 @@
         bundle-plugin-extended-callhistory-search,
         bundle-rss,bundle-plugin-rssaccregwizz,
         bundle-zeroconf,bundle-plugin-zeroconfaccregwizz,
+        bundle-irc,bundle-plugin-ircaccregwizz,
         bundle-pluginmanager,bundle-notification"/>
 
     <!--BUNDLE-HISTORY-->
@@ -1082,7 +1082,7 @@
             <zipfileset src="${lib.noinst}/architectureviewer1.1.jar" prefix=""/>
             <manifest>
                 <attribute name="Import-Package"
-                    value="javax.swing,	javax.swing.text,
+                    value="javax.swing, javax.swing.text,
 org.ungoverned.gravity.servicebinder, org.ungoverned.gravity.servicebinder.architecture,
 javax.accessibility, javax.swing.plaf, javax.swing.tree, javax.swing.undo,
 javax.swing.event, javax.swing.border"/>
@@ -1638,6 +1638,32 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
+    <!-- BUNDLE-IRC -->
+    <target name="bundle-irc">
+        <!-- Creates a bundle containing the IRC impl of the protocol provider.-->
+        <jar compress="false" destfile="${bundles.dest}/protocol-irc.jar"
+         manifest="src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/irc"
+                        prefix="net/java/sip/communicator/impl/protocol/irc"/>
+            <zipfileset src="${lib.noinst}/pircbot.jar" prefix=""/>
+            <zipfileset dir="resources/images/irc"
+                    prefix="resources/images/irc"/>
+            </jar>
+        </target>
+
+    <!-- BUNDLE-PLUGIN-IRCACCREGWIZZ -->
+    <target name="bundle-plugin-ircaccregwizz">
+            <!-- Creates a bundle for the plugin IRC Account Registration
+                 Wizard.-->
+            <jar compress="false" destfile="${bundles.dest}/ircaccregwizz.jar"
+                manifest="src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf">
+                <zipfileset dir="${dest}/net/java/sip/communicator/plugin/ircaccregwizz"
+                    prefix="net/java/sip/communicator/plugin/ircaccregwizz"/>
+                <zipfileset dir="resources/images/irc"
+                    prefix="resources/images/irc"/>
+            </jar>
+    </target>
+
     <!--BUNDLE-LOG4J -->
     <target name="bundle-log4j">
         <jar compress="true" destfile="lib/bundle/log4j.jar"
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 3f11bfdf0..88ad72cde 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -72,6 +72,7 @@ felix.auto.start.50= \
  reference:file:sc-bundles/netaddr.jar \
  reference:file:sc-bundles/protocol-rss.jar \
  reference:file:sc-bundles/protocol-zeroconf.jar \
+ reference:file:sc-bundles/protocol-irc.jar \
  reference:file:sc-bundles/meta-cl.jar
 
 felix.auto.start.60= \
@@ -98,6 +99,7 @@ felix.auto.start.60= \
  reference:file:sc-bundles/extendedcallhistorysearch.jar \
  reference:file:sc-bundles/rssaccregwizz.jar \
  reference:file:sc-bundles/zeroconfaccregwizz.jar \
+ reference:file:sc-bundles/ircaccregwizz.jar \
  reference:file:sc-bundles/shutdown.jar
 
 # Uncomment the following lines if you want to run the architect viewer