diff --git a/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java b/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
index 2b5e0a7..18e79e8 100644
--- a/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
+++ b/src/main/java/org/apache/maven/plugins/ejb/IncludesExcludes.java
@@ -46,33 +46,27 @@ public IncludesExcludes( List<String> includes, List<String> excludes, List<Stri
 
     public String[] resultingIncludes()
     {
-        String[] result = new String[0];
-        if ( includes.isEmpty() )
-        {
-            result = defaultIncludes.toArray( new String[defaultIncludes.size()] );
-        }
-        else
-        {
-            result = includes.toArray( new String[includes.size()] );
-        }
-
-        return result;
+        return resultingXcludes( includes, defaultIncludes );
     }
 
     public String[] resultingExcludes()
+    {
+        return resultingXcludes( excludes, defaultExcludes );
+    }
+
+    private static String[] resultingXcludes( List<String> currentXcludes, List<String> defaultXcludes )
     {
         String[] result = new String[0];
-        if ( excludes.isEmpty() )
+        if ( currentXcludes.isEmpty() )
         {
-            result = defaultExcludes.toArray( new String[defaultExcludes.size()] );
+            result = defaultXcludes.toArray( new String[defaultXcludes.size()] );
         }
         else
         {
-            result = excludes.toArray( new String[excludes.size()] );
+            result = currentXcludes.toArray( new String[currentXcludes.size()] );
         }
 
         return result;
-
     }
 
     private List<String> makeNonNullList( List<String> in )
diff --git a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
index 430de25..5261d21 100644
--- a/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
+++ b/src/test/java/org/apache/maven/plugins/ejb/IncludesExcludesTest.java
@@ -79,4 +79,21 @@ public void nonNullForDefaultIncludesShouldResultInIncludesWithDefaultIncludes()
         assertThat( ie.resultingExcludes() ).isEqualTo( new String[0] );
     }
 
+    @Test
+    public void nonNullIncludesShouldResultInTheSameIncludes()
+    {
+        IncludesExcludes ie = new IncludesExcludes( Arrays.asList( "**/package.html" ), null,
+                                                    Arrays.asList( "**/site.html" ), null );
+
+        assertThat( ie.resultingIncludes() ).isEqualTo( new String[] { "**/package.html" } );
+    }
+
+    @Test
+    public void nonNullExcludesShouldResultInTheSameExcludes()
+    {
+        IncludesExcludes ie = new IncludesExcludes( null, Arrays.asList( "**/package.html" ),
+                                                    null, Arrays.asList( "**/site.html" ) );
+
+        assertThat( ie.resultingExcludes() ).isEqualTo( new String[] { "**/package.html" } );
+    }
 }