diff --git a/scm-core/src/main/java/sonia/scm/security/HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/HashBuilder.java
index 0ed9d478cb..c1b52cfc20 100644
--- a/scm-core/src/main/java/sonia/scm/security/HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/HashBuilder.java
@@ -30,12 +30,18 @@
  */
 
 
+
 package sonia.scm.security;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.apache.shiro.crypto.hash.SimpleHash;
+
 /**
  *
  * @author Sebastian Sdorra
  * @since 1.13
+ * @deprecated use {@link SimpleHash} instead.
  */
 public interface HashBuilder
 {
diff --git a/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java
index 87cf343c9c..4db3f4412b 100644
--- a/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/MD5HashBuilder.java
@@ -30,11 +30,18 @@
  */
 
 
+
 package sonia.scm.security;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.apache.shiro.crypto.hash.Md5Hash;
+
 /**
  *
  * @author Sebastian Sdorra
+ * @since 1.13
+ * @deprecated use {@link Md5Hash} instead.
  */
 public class MD5HashBuilder extends MessageDigestHashBuilder
 {
@@ -99,7 +106,7 @@ public class MD5HashBuilder extends MessageDigestHashBuilder
    * @param appendSalt
    */
   public MD5HashBuilder(String value, byte[] salt, int iterations,
-                        boolean appendSalt)
+    boolean appendSalt)
   {
     super(DIGEST, value, salt, iterations, appendSalt, false);
   }
@@ -115,7 +122,7 @@ public class MD5HashBuilder extends MessageDigestHashBuilder
    * @param enableLabel
    */
   public MD5HashBuilder(String value, byte[] salt, int iterations,
-                        boolean appendSalt, boolean enableLabel)
+    boolean appendSalt, boolean enableLabel)
   {
     super(DIGEST, value, salt, iterations, appendSalt, enableLabel);
   }
diff --git a/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java b/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java
index 4b1c91bfbe..fbfb5804e1 100644
--- a/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/MessageDigestHashBuilder.java
@@ -46,11 +46,13 @@ import java.security.SecureRandom;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.shiro.crypto.hash.SimpleHash;
 
 /**
  *
  * @author Sebastian Sdorra
  * @since 1.13
+ * @deprecated use {@link SimpleHash} instead.
  */
 public class MessageDigestHashBuilder implements HashBuilder
 {
diff --git a/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java
index a76ca3f210..428b93a354 100644
--- a/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/SHA1HashBuilder.java
@@ -30,12 +30,18 @@
  */
 
 
+
 package sonia.scm.security;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.apache.shiro.crypto.hash.Sha1Hash;
+
 /**
  *
  * @author Sebastian Sdorra
  * @since 1.13
+ * @deprecated use {@link Sha1Hash} instead.
  */
 public class SHA1HashBuilder extends MessageDigestHashBuilder
 {
@@ -100,7 +106,7 @@ public class SHA1HashBuilder extends MessageDigestHashBuilder
    * @param appendSalt
    */
   public SHA1HashBuilder(String value, byte[] salt, int iterations,
-                         boolean appendSalt)
+    boolean appendSalt)
   {
     super(DIGEST, value, salt, iterations, appendSalt, false);
   }
@@ -114,9 +120,10 @@ public class SHA1HashBuilder extends MessageDigestHashBuilder
    * @param iterations
    * @param appendSalt
    * @param enableLable
+   * @param enableLabel
    */
   public SHA1HashBuilder(String value, byte[] salt, int iterations,
-                         boolean appendSalt, boolean enableLabel)
+    boolean appendSalt, boolean enableLabel)
   {
     super(DIGEST, value, salt, iterations, appendSalt, enableLabel);
   }
diff --git a/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java b/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java
index dccdc01e34..d218cad754 100644
--- a/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java
+++ b/scm-core/src/main/java/sonia/scm/security/SHA512HashBuilder.java
@@ -30,12 +30,18 @@
  */
 
 
+
 package sonia.scm.security;
 
+//~--- non-JDK imports --------------------------------------------------------
+
+import org.apache.shiro.crypto.hash.Sha512Hash;
+
 /**
  *
  * @author Sebastian Sdorra
  * @since 1.13
+ * @deprecated use {@link Sha512Hash} instead.
  */
 public class SHA512HashBuilder extends MessageDigestHashBuilder
 {
@@ -100,7 +106,7 @@ public class SHA512HashBuilder extends MessageDigestHashBuilder
    * @param appendSalt
    */
   public SHA512HashBuilder(String value, byte[] salt, int iterations,
-                           boolean appendSalt)
+    boolean appendSalt)
   {
     super(DIGEST, value, salt, iterations, appendSalt, false);
   }
@@ -116,7 +122,7 @@ public class SHA512HashBuilder extends MessageDigestHashBuilder
    * @param enableLabel
    */
   public SHA512HashBuilder(String value, byte[] salt, int iterations,
-                           boolean appendSalt, boolean enableLabel)
+    boolean appendSalt, boolean enableLabel)
   {
     super(DIGEST, value, salt, iterations, appendSalt, enableLabel);
   }