diff --git a/backup.sh b/backup.sh
index 2aa0133..52d6f1b 100755
--- a/backup.sh
+++ b/backup.sh
@@ -1,9 +1,16 @@
 #!/bin/bash
 
+
 # backup directory
 backupDir=./backup
 mkdir -p ${backupDir}
 mkdir -p ${backupDir}/db
+if [ -d "data/data" ]; then
+	mkdir -p ${backupDir}/data
+fi
+if [ -d "data/gist" ]; then
+	mkdir -p ${backupDir}/gist
+fi
 mkdir -p ${backupDir}/repositories
 
 # current date
@@ -20,5 +27,17 @@
 repoFile="${backupDir}/repositories/${currentDate}.tbz2"
 tar -cj data/repositories -f ${repoFile}
 
+# backup gist repositories if existing
+if [ -d "data/gist" ]; then
+	repoFile="${backupDir}/gist/${currentDate}.tbz2"
+	tar -cj data/gist -f ${repoFile}
+fi
+
+# backup data if existing
+if [ -d "data/data" ]; then
+	repoFile="${backupDir}/data/${currentDate}.tbz2"
+	tar -cj data/data -f ${repoFile}
+fi
+
 # delete all files older 10 days
 find ${backupDir} -iname "*.tbz2" -type f -mtime +10 -exec rm {} \; > /dev/null
diff --git a/docker-compose.yml b/docker-compose.yml
index 8fbd241..9cc396a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,6 +14,8 @@
         - GITBUCKET_DATABASE_PASSWORD=${GITBUCKET_DATABASE_PASSWORD}
       volumes:
         - ./data/repositories/:/srv/gitbucket/repositories/
+        - ./data/data/:/srv/gitbucket/data/
+        - ./data/gist/:/srv/gitbucket/gist/
         - ./data/plugins/:/srv/gitbucket/plugins/
         - ./data/conf/gitbucket/gitbucket.conf:/srv/gitbucket/gitbucket.conf
       tmpfs:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3932404..9276889 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,6 +7,8 @@
 
 # mark voulmes
 VOLUME $GITBUCKET_HOME/repositories
+VOLUME $GITBUCKET_HOME/data
+VOLUME $GITBUCKET_HOME/gist
 VOLUME $GITBUCKET_HOME/plugins
 
 # setup