diff --git a/aide.changes b/aide.changes
index d946235..3a46961 100644
--- a/aide.changes
+++ b/aide.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 15 14:11:14 UTC 2014 - meissner@suse.com
+
+- aide.conf: Move from md5 and sha1 as default to sha256+sha512, also
+  to allow FIPS enabling with aide working. FATE#315925
+
 -------------------------------------------------------------------
 Fri Apr 26 11:26:37 UTC 2013 - mmeister@suse.com
 
diff --git a/aide.conf b/aide.conf
index 28ba73e..6a7b453 100644
--- a/aide.conf
+++ b/aide.conf
@@ -20,13 +20,13 @@ warn_dead_symlinks=yes
 #
 # Custom rules
 #
-Binlib 		= p+i+n+u+g+s+b+m+c+md5+sha1 
-ConfFiles 	= p+i+n+u+g+s+b+m+c+md5+sha1 
+Binlib 		= p+i+n+u+g+s+b+m+c+sha256+sha512 
+ConfFiles 	= p+i+n+u+g+s+b+m+c+sha256+sha512
 Logs 		= p+i+n+u+g+S 
-Devices 	= p+i+n+u+g+s+b+c+md5+sha1 
+Devices 	= p+i+n+u+g+s+b+c+sha256+sha512
 Databases 	= p+n+u+g 
 StaticDir 	= p+i+n+u+g 
-ManPages 	= p+i+n+u+g+s+b+m+c+md5+sha1 
+ManPages 	= p+i+n+u+g+s+b+m+c+sha256+sha512
 
 #
 # Directories and files
diff --git a/aide.spec b/aide.spec
index 4fb3203..3937ce5 100644
--- a/aide.spec
+++ b/aide.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aide
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -82,9 +82,11 @@ sed -e "s#/var/lib/aide#$TESTDIR/var/lib/aide#g" <$TESTDIR/etc/aide.conf.new >$T
 sleep 2
 sync
 sleep 2
+
 $TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --init
 mv $TESTDIR/var/lib/aide/aide.db.new $TESTDIR/var/lib/aide/aide.db
 $TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --check --verbose
+
 rm -rf $TESTDIR
 
 %files