diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index 60033716a..278f37b85 100644
--- a/config/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -27,6 +27,12 @@
 		<property name="format" value="^ +\t+"/>
 		<property name="message" value="Line containing tab(s) after space"/>
 	</module>
+	<module name="RegexpSingleline">
+		<!-- We use {2,} instead of + here to address the typical case where a file was written
+		   with tabs but javadoc is causing '\t *' -->
+		<property name="format" value="^\t+ {2,}"/>
+		<property name="message" value="Line containing space(s) after tab(s)"/>
+	</module>
 	<module name="RegexpSingleline">
 		<!--
 			Explaining the following Regex
diff --git a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java
index d203aa097..9b252dd40 100644
--- a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java
+++ b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java
@@ -92,13 +92,12 @@ public class ServerPingWithAlarmManager extends Manager {
 		super(connection);
 	}
 
-	/**
-	 * If enabled, ServerPingWithAlarmManager will call
-	 * {@link PingManager#pingServerIfNecessary()} for the connection of this
-	 * instance every half hour.
-	 * 
-	 * @param enabled
-	 */
+    /**
+     * If enabled, ServerPingWithAlarmManager will call {@link PingManager#pingServerIfNecessary()}
+     * for the connection of this instance every half hour.
+     * 
+     * @param enabled
+     */
 	public void setEnabled(boolean enabled) {
 		mEnabled = enabled;
 	}
@@ -144,14 +143,13 @@ public class ServerPingWithAlarmManager extends Manager {
 	private static PendingIntent sPendingIntent;
 	private static AlarmManager sAlarmManager;
 
-	/**
-	 * Register a pending intent with the AlarmManager to be broadcasted every
-	 * half hour and register the alarm broadcast receiver to receive this
-	 * intent. The receiver will check all known questions if a ping is
-	 * Necessary when invoked by the alarm intent.
-	 * 
-	 * @param context
-	 */
+    /**
+     * Register a pending intent with the AlarmManager to be broadcasted every half hour and
+     * register the alarm broadcast receiver to receive this intent. The receiver will check all
+     * known questions if a ping is Necessary when invoked by the alarm intent.
+     * 
+     * @param context
+     */
 	public static void onCreate(Context context) {
 		sContext = context;
 		context.registerReceiver(ALARM_BROADCAST_RECEIVER, new IntentFilter(PING_ALARM_ACTION));
@@ -162,9 +160,9 @@ public class ServerPingWithAlarmManager extends Manager {
 				AlarmManager.INTERVAL_HALF_HOUR, sPendingIntent);
 	}
 
-	/**
-	 * Unregister the alarm broadcast receiver and cancel the alarm. 
-	 */
+    /**
+     * Unregister the alarm broadcast receiver and cancel the alarm.
+     */
 	public static void onDestroy() {
 		sContext.unregisterReceiver(ALARM_BROADCAST_RECEIVER);
 		sAlarmManager.cancel(sPendingIntent);
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java
index 8f213a4cc..f0ad23087 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java
@@ -61,10 +61,10 @@ public class PacketCollectorTest
 		assertNull(collector.nextResult(1000));
 	}
 
-	/**
-	 * Although this doesn't guarentee anything due to the nature of threading, it can 
-	 * potentially catch problems.
-	 */
+    /**
+     * Although this doesn't guarentee anything due to the nature of threading, it can potentially
+     * catch problems.
+     */
 	@Test
 	public void verifyThreadSafety()
 	{
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
index e2f0eb440..86df0b2cb 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java
@@ -68,7 +68,7 @@ public class StringUtilsTest  {
     }
 
 	public static void assertCharSequenceEquals(CharSequence expected, CharSequence actual) {
-	    assertEquals(expected.toString(), actual.toString());
+        assertEquals(expected.toString(), actual.toString());
 	}
 
 	@Test
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
index b7cd1d69a..1818086dc 100644
--- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
+++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
@@ -354,6 +354,7 @@ public class EnhancedDebugger implements SmackDebugger {
         menu.add(menuItem1);
         // Add listener to the text area so the popup menu can come up.
         messageTextArea.addMouseListener(new PopupListener(menu));
+        // CHECKSTYLE:OFF
 	JPanel sublayout = new JPanel(new BorderLayout());
         sublayout.add(new JScrollPane(messageTextArea), BorderLayout.CENTER);
 
@@ -365,9 +366,9 @@ public class EnhancedDebugger implements SmackDebugger {
 	    @Override
 	    public void actionPerformed(ActionEvent e) {
             messagesTable.setRowCount(0);
-
 	    }
 	});
+         // CHECKSTYLE:ON
 
         sublayout.add(clearb, BorderLayout.NORTH);
         allPane.setBottomComponent(sublayout);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
index 77eb55e6e..74d4737e1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
@@ -187,8 +187,10 @@ public abstract class FileTransfer {
 
 	protected void setStatus(Status status) {
         synchronized (statusMonitor) {
+         // CHECKSTYLE:OFF
 		    this.status = status;
 	    }
+        // CHECKSTYLE:ON
     }
 
     protected boolean updateStatus(Status oldStatus, Status newStatus) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
index 4ef707fb5..19c11de48 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
@@ -87,7 +87,9 @@ public abstract class StreamNegotiator {
     }
 
     protected final IQ initiateIncomingStream(final XMPPConnection connection, StreamInitiation initiation)
+    // CHECKSTYLE:OFF
 				   throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
+    // CHECKSTYLE:ON
         final StreamInitiation response = createInitiationAccept(initiation,
                 getNamespaces());
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
index 571d061ed..71c415930 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
@@ -304,7 +304,9 @@ abstract public class Node
 	 */
 	public Subscription subscribe(String jid) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
 	{
+// CHECKSTYLE:OFF
 	    PubSub pubSub = createPubsubPacket(Type.set, new SubscribeExtension(jid, getId()));
+// CHECKSTYLE:ON
 		PubSub reply = sendPubsubPacket(pubSub);
 		return reply.getExtension(PubSubElementType.SUBSCRIPTION);
 	}
@@ -330,7 +332,9 @@ abstract public class Node
 	 */
 	public Subscription subscribe(String jid, SubscribeForm subForm) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
 	{
+// CHECKSTYLE:OFF
 	    PubSub request = createPubsubPacket(Type.set, new SubscribeExtension(jid, getId()));
+// CHECKSTYLE:ON
 		request.addExtension(new FormNode(FormNodeType.OPTIONS, subForm));
 		PubSub reply = PubSubManager.sendPubsubPacket(con, request);
 		return reply.getExtension(PubSubElementType.SUBSCRIPTION);
@@ -545,7 +549,9 @@ abstract public class Node
 		@SuppressWarnings({ "rawtypes", "unchecked" })
         public void processPacket(Stanza packet)
 		{
+// CHECKSTYLE:OFF
 	        EventElement event = (EventElement)packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
+// CHECKSTYLE:ON
 			ItemsExtension itemsElem = (ItemsExtension)event.getEvent();
             ItemPublishEvent eventItems = new ItemPublishEvent(itemsElem.getNode(), (List<Item>)itemsElem.getItems(), getSubscriptionIds(packet), DelayInformationManager.getDelayTimestamp(packet));
 			listener.handlePublishedItems(eventItems);
@@ -569,6 +575,7 @@ abstract public class Node
 
 		public void processPacket(Stanza packet)
 		{
+// CHECKSTYLE:OFF
 	        EventElement event = (EventElement)packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
 
 	        List<ExtensionElement> extList = event.getExtensions();
@@ -592,6 +599,7 @@ abstract public class Node
 				ItemDeleteEvent eventItems = new ItemDeleteEvent(itemsElem.getNode(), items, getSubscriptionIds(packet));
 				listener.handleDeletedItems(eventItems);
 	        }
+// CHECKSTYLE:ON
 		}
 	}
 
@@ -612,8 +620,10 @@ abstract public class Node
 
 		public void processPacket(Stanza packet)
 		{
+// CHECKSTYLE:OFF
 	        EventElement event = (EventElement)packet.getExtension("event", PubSubNamespace.EVENT.getXmlns());
-			ConfigurationEvent config = (ConfigurationEvent)event.getEvent();
+	        ConfigurationEvent config = (ConfigurationEvent)event.getEvent();
+// CHECKSTYLE:ON
 
 			listener.handleNodeConfiguration(config);
 		}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
index 96491f31e..7b7af0c14 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java
@@ -321,10 +321,12 @@ final public class PubSubManager
 
 	static PubSub sendPubsubPacket(XMPPConnection con, Jid to, Type type, List<ExtensionElement> extList, PubSubNamespace ns) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException
 	{
+// CHECKSTYLE:OFF
 	    PubSub pubSub = new PubSub(to, type, ns);
 	    for (ExtensionElement pe : extList) {
 	        pubSub.addExtension(pe);
 	    }
+// CHECKSTYLE:ON
 		return sendPubsubPacket(con ,pubSub);
 	}
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java
index 2fbcb9373..d4a237e57 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java
@@ -36,6 +36,8 @@ public class EventProvider extends EmbeddedExtensionProvider<EventElement>
 	@Override
 	protected EventElement createReturnExtension(String currentElement, String currentNamespace, Map<String, String> attMap, List<? extends ExtensionElement> content)
 	{
+// CHECKSTYLE:OFF
 	   	return new EventElement(EventElementType.valueOf(content.get(0).getElementName()), (NodeExtension)content.get(0));
+// CHECKSTYLE:ON
 	}
 }
diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java
index a6d89ef48..1427ac17c 100644
--- a/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java
+++ b/smack-java7/src/main/java/org/jivesoftware/smack/util/stringencoder/java7/Base64.java
@@ -63,10 +63,10 @@ public class Base64
 	 public final static int URL_SAFE = 16;
 
 
-	 /**
-	  * Encode using the special "ordered" dialect of Base64 described here:
-	  * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
-	  */
+	/**
+	 * Encode using the special "ordered" dialect of Base64 described here:
+	 * <a href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
+	 */
 	 public final static int ORDERED = 32;