diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenLocalVersion.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenLocalVersion.java
index 92d98b2160653b4f51a4dc3666394b9b2040a93e..33feff7332fcda486ad3ce0ff80c652ee0979951 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenLocalVersion.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenLocalVersion.java
@@ -62,6 +62,9 @@ public class MavenLocalVersion
     }
 
     public File getCacheFile() {
+        if (artifact.getRepository().isLocal()) {
+            return new File(getExternalURL(MavenArtifact.FILE_JAR));
+        }
         return new File(artifact.getRepository().getLocalCacheDir(), artifact.getGroupId() + "/" + fileName);
     }
 
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java
index 3cd6f90b3b4516a3106acfef3443ca5cffb21e3b..d599feb72cd4f6e4606bcb57c06a65086b82527c 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java
@@ -26,40 +26,53 @@ import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.utils.CommonUtils;
 
+import java.io.IOException;
 import java.util.*;
 
 public class MavenRegistry
 {
+    public static final String MAVEN_LOCAL_REPO_ID = "local";
+    public static final String MAVEN_LOCAL_REPO_NAME = "Local Repository";
+    public static final String MAVEN_LOCAL_REPO_FOLDER = "maven-local";
+
     private static MavenRegistry instance = null;
 
     public synchronized static MavenRegistry getInstance()
     {
         if (instance == null) {
             instance = new MavenRegistry();
-            instance.loadExtensions(Platform.getExtensionRegistry());
             instance.loadCustomRepositories();
         }
         return instance;
     }
 
     private final List<MavenRepository> repositories = new ArrayList<MavenRepository>();
+    private final MavenRepository localRepository;
     // Cache for not found artifact ids. Avoid multiple remote metadata reading
     private final Set<String> notFoundArtifacts = new HashSet<String>();
 
     private MavenRegistry()
     {
-    }
-
-    private void loadExtensions(IExtensionRegistry registry)
-    {
-        // Load data type providers from external plugins
+        // Load repositories info
         {
-            IConfigurationElement[] extElements = registry.getConfigurationElementsFor(MavenRepository.EXTENSION_ID);
+            IConfigurationElement[] extElements = Platform.getExtensionRegistry().getConfigurationElementsFor(MavenRepository.EXTENSION_ID);
             for (IConfigurationElement ext : extElements) {
                 MavenRepository repository = new MavenRepository(ext);
                 repositories.add(repository);
             }
         }
+        // Create local repository
+        String localRepoURL;
+        try {
+            localRepoURL = Platform.getInstallLocation().getDataArea(MAVEN_LOCAL_REPO_FOLDER).toString();
+        } catch (IOException e) {
+            localRepoURL = Platform.getInstallLocation().getURL().toString() + "/" + MAVEN_LOCAL_REPO_FOLDER;
+        }
+        localRepository = new MavenRepository(
+            MAVEN_LOCAL_REPO_ID,
+            MAVEN_LOCAL_REPO_NAME,
+            localRepoURL,
+            true);
     }
 
     public void loadCustomRepositories() {
@@ -85,7 +98,7 @@ public class MavenRegistry
             }
             String repoID = repoInfo.substring(0, divPos);
             String repoURL = repoInfo.substring(divPos + 1);
-            MavenRepository repo = new MavenRepository(repoID, repoID, repoURL);
+            MavenRepository repo = new MavenRepository(repoID, repoID, repoURL, false);
             repositories.add(repo);
         }
     }
@@ -107,12 +120,20 @@ public class MavenRegistry
             return null;
         }
 
+        // Try all available repositories
         for (MavenRepository repository : repositories) {
             MavenArtifact artifact = repository.findArtifact(groupId, artifactId);
             if (artifact != null) {
                 return artifact;
             }
         }
+        // Try local repository
+        MavenArtifact artifact = localRepository.findArtifact(groupId, artifactId);
+        if (artifact != null) {
+            return artifact;
+        }
+
+        // Not found
         notFoundArtifacts.add(fullId);
         return null;
     }
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java
index 1238ebb19cd94ed5a640b041b5cbe2c67bcb272a..d25cbf09ac4d62f37780004b09e29d372b5a7d96 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java
@@ -63,6 +63,7 @@ public class MavenRepository
     private String id;
     private String name;
     private String url;
+    private boolean local;
     private boolean predefined = false;
 
     private List<MavenArtifact> cachedArtifacts = new ArrayList<MavenArtifact>();
@@ -72,15 +73,19 @@ public class MavenRepository
         this(
             config.getAttribute(RegistryConstants.ATTR_ID),
             config.getAttribute(RegistryConstants.ATTR_NAME),
-            config.getAttribute(RegistryConstants.ATTR_URL));
+            config.getAttribute(RegistryConstants.ATTR_URL),
+            false);
         this.predefined = true;
     }
 
-    public MavenRepository(String id, String name, String url) {
+    MavenRepository(String id, String name, String url, boolean local) {
         this.id = id;
         this.name = name;
         this.url = url;
-        loadCache();
+        this.local = local;
+        if (!local) {
+            loadCache();
+        }
     }
 
     public void flushCache() {
@@ -104,7 +109,7 @@ public class MavenRepository
     }
 
     public boolean isLocal() {
-        return false;
+        return local;
     }
 
     @Nullable