diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index 0617266d7..b110d4285 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -532,6 +532,11 @@ public class DefaultManagedRepositoryAdmin
                 {
                     indexer.removeIndexingContext( indexingContext, true );
                 }
+
+                // delete directory too as only content is deleted
+                File indexDirectory = indexingContext.getIndexDirectoryFile();
+                FileUtils.deleteDirectory( indexDirectory );
+
                 createIndexContext( managedRepository );
             }
             catch ( IOException e )