diff --git a/cmd_db.go b/cmd_db.go
new file mode 100644
index 00000000..5dfd3da0
--- /dev/null
+++ b/cmd_db.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"github.com/gonuts/commander"
+	"github.com/gonuts/flag"
+)
+
+func makeCmdDbCleanup() *commander.Command {
+	cmd := &commander.Command{
+		Run:       aptlyDbCleanup,
+		UsageLine: "cleanup",
+		Short:     "remove unused entries in DB and unreferenced files in the pool",
+		Long: `
+Database cleanup removes information about unreferenced packages and removes
+files in the package pool that aren't used by packages anymore
+
+ex:
+  $ aptly db cleanup
+`,
+		Flag: *flag.NewFlagSet("aptly-db-cleanup", flag.ExitOnError),
+	}
+
+	return cmd
+}
+
+func makeCmdDb() *commander.Command {
+	return &commander.Command{
+		UsageLine: "db",
+		Short:     "manage aptly's internal database and package pool",
+		Subcommands: []*commander.Command{
+			makeCmdDbCleanup(),
+		},
+		Flag: *flag.NewFlagSet("aptly-db", flag.ExitOnError),
+	}
+}
diff --git a/cmd_db_cleanup.go b/cmd_db_cleanup.go
new file mode 100644
index 00000000..172c37a4
--- /dev/null
+++ b/cmd_db_cleanup.go
@@ -0,0 +1,131 @@
+package main
+
+import (
+	"fmt"
+	"github.com/gonuts/commander"
+	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/utils"
+	"sort"
+)
+
+// aptly db cleanup
+func aptlyDbCleanup(cmd *commander.Command, args []string) error {
+	var err error
+
+	if len(args) != 0 {
+		cmd.Usage()
+		return err
+	}
+
+	// collect information about references packages...
+	existingPackageRefs := debian.NewPackageRefList()
+
+	context.downloader.GetProgress().Printf("Loading mirrors and snapshots...\n")
+	repoCollection := debian.NewRemoteRepoCollection(context.database)
+	err = repoCollection.ForEach(func(repo *debian.RemoteRepo) error {
+		err := repoCollection.LoadComplete(repo)
+		if err != nil {
+			return err
+		}
+		existingPackageRefs = existingPackageRefs.Merge(repo.RefList(), false)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	snapshotCollection := debian.NewSnapshotCollection(context.database)
+	err = snapshotCollection.ForEach(func(snapshot *debian.Snapshot) error {
+		err := snapshotCollection.LoadComplete(snapshot)
+		if err != nil {
+			return err
+		}
+		existingPackageRefs = existingPackageRefs.Merge(snapshot.RefList(), false)
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	// ... and compare it to the list of all packages
+	context.downloader.GetProgress().Printf("Loading list of all packages...\n")
+	packageCollection := debian.NewPackageCollection(context.database)
+	allPackageRefs := packageCollection.AllPackageRefs()
+
+	toDelete := allPackageRefs.Substract(existingPackageRefs)
+
+	// delete packages that are no longer referenced
+	context.downloader.GetProgress().Printf("Deleting unreferenced packages (%d)...\n", toDelete.Len())
+
+	context.database.StartBatch()
+	err = toDelete.ForEach(func(ref []byte) error {
+		return packageCollection.DeleteByKey(ref)
+	})
+	if err != nil {
+		return err
+	}
+
+	err = context.database.FinishBatch()
+	if err != nil {
+		return fmt.Errorf("unable to write to DB: %s", err)
+	}
+
+	// now, build a list of files that should be present in Repository (package pool)
+	context.downloader.GetProgress().Printf("Building list of files referenced by packages...\n")
+	referencedFiles := make([]string, 0, existingPackageRefs.Len())
+	context.downloader.GetProgress().InitBar(int64(existingPackageRefs.Len()), false)
+
+	err = existingPackageRefs.ForEach(func(key []byte) error {
+		pkg, err := packageCollection.ByKey(key)
+		if err != nil {
+			return err
+		}
+		paths, err := pkg.FilepathList(context.packageRepository)
+		if err != nil {
+			return err
+		}
+		referencedFiles = append(referencedFiles, paths...)
+		context.downloader.GetProgress().AddBar(1)
+
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
+	sort.Strings(referencedFiles)
+	context.downloader.GetProgress().ShutdownBar()
+
+	// build a list of files in the package pool
+	context.downloader.GetProgress().Printf("Building list of files in package pool...\n")
+	existingFiles, err := context.packageRepository.PoolFilepathList(context.downloader.GetProgress())
+	if err != nil {
+		return fmt.Errorf("unable to collect file paths: %s", err)
+	}
+
+	// find files which are in the pool but not referenced by packages
+	filesToDelete := utils.StrSlicesSubstract(existingFiles, referencedFiles)
+
+	// delete files that are no longer referenced
+	context.downloader.GetProgress().Printf("Deleting unreferenced files (%d)...\n", len(filesToDelete))
+
+	if len(filesToDelete) > 0 {
+		context.downloader.GetProgress().InitBar(int64(len(filesToDelete)), false)
+
+		totalSize := int64(0)
+
+		for _, file := range filesToDelete {
+			size, err := context.packageRepository.PoolRemove(file)
+			if err != nil {
+				return err
+			}
+
+			context.downloader.GetProgress().AddBar(1)
+			totalSize += size
+		}
+
+		context.downloader.GetProgress().ShutdownBar()
+	}
+
+	return err
+}
diff --git a/main.go b/main.go
index 72eaf37e..219cc946 100644
--- a/main.go
+++ b/main.go
@@ -27,11 +27,12 @@ repositories, filter them, merge, upgrade individual packages,
 take snapshots and publish them back as Debian repositories.`,
 		Flag: *flag.NewFlagSet("aptly", flag.ExitOnError),
 		Subcommands: []*commander.Command{
+			makeCmdDb(),
+			makeCmdGraph(),
 			makeCmdMirror(),
+			makeCmdServe(),
 			makeCmdSnapshot(),
 			makeCmdPublish(),
-			makeCmdServe(),
-			makeCmdGraph(),
 			makeCmdVersion(),
 		},
 	}