diff --git a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
index 3b2dbe2..9ee3f70 100644
--- a/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
+++ b/src/main/java/org/apache/maven/plugins/scmpublish/AbstractScmPublishMojo.java
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -512,9 +513,8 @@
         {
 
             // create a temporary directory for svnexec
-            baseDir = File.createTempFile( "scm", "tmp" );
-            baseDir.delete();
-            baseDir.mkdirs();
+            baseDir = Files.createTempDirectory( "scm" ).toFile();
+
             // to prevent fileSet cannot be empty
             ScmFileSet scmFileSet = new ScmFileSet( baseDir, new File( "" ) );