diff --git a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
index 2a6225f25..c936081bb 100644
--- a/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
+++ b/src/checkstyle/com/puppycrawl/tools/checkstyle/checks/WhitespaceAroundCheck.java
@@ -94,6 +94,13 @@ public class WhitespaceAroundCheck
             return;
         }
 
+        // Check for import pkg.name.*;
+        if ((aAST.getType() == TokenTypes.STAR)
+            && (aAST.getParent().getType() == TokenTypes.DOT))
+        {
+            return;
+        }
+        
         final String[] lines = getLines();
         final String line = lines[aAST.getLineNo() - 1];
         final int before = aAST.getColumnNo() - 1;
diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java b/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java
index b506a93c4..6f34cdfba 100644
--- a/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java
+++ b/src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java
@@ -4,7 +4,7 @@
 // Ignore error
 ////////////////////////////////////////////////////////////////////////////////
 package com.puppycrawl.tools.checkstyle;
-
+import java.io.*;
 /**
  * Contains simple mistakes:
  * - Long lines