diff --git a/src/database/fs.rs b/src/database/fs.rs
index f528d23..4fa41d4 100644
--- a/src/database/fs.rs
+++ b/src/database/fs.rs
@@ -6,7 +6,7 @@ use std::os::unix::fs::symlink;
 
 use tempfile;
 use serde_json;
-use openpgp::UserID;
+use openpgp::packet::UserID;
 use base64;
 
 use database::{Verify, Delete, Fingerprint, Database};
diff --git a/src/database/memory.rs b/src/database/memory.rs
index 1813c01..d6ba79a 100644
--- a/src/database/memory.rs
+++ b/src/database/memory.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use parking_lot::Mutex;
 
-use openpgp::UserID;
+use openpgp::packet::UserID;
 use base64;
 
 use database::{Verify, Delete, Fingerprint, Database};
diff --git a/src/database/mod.rs b/src/database/mod.rs
index a836934..d5b3a90 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -6,7 +6,7 @@ use std::fmt;
 
 use serde::{Serializer, Deserializer, de};
 use time;
-use openpgp::{self, Signature, TPK, UserID, Packet, PacketPile, constants::SignatureType};
+use openpgp::{self, packet::Signature, TPK, packet::UserID, Packet, PacketPile, constants::SignatureType};
 use base64;
 use {Error, Result};
 
diff --git a/src/database/poly.rs b/src/database/poly.rs
index 41e4a62..58c5676 100644
--- a/src/database/poly.rs
+++ b/src/database/poly.rs
@@ -1,7 +1,7 @@
 use errors::Result;
 use database::{Verify, Delete, Database, Fingerprint, Filesystem, Memory};
 
-use openpgp::UserID;
+use openpgp::packet::UserID;
 
 pub enum Polymorphic {
     Memory(Memory),
diff --git a/src/database/test.rs b/src/database/test.rs
index f770a44..a1a0e86 100644
--- a/src/database/test.rs
+++ b/src/database/test.rs
@@ -20,7 +20,7 @@ use std::sync::atomic::{Ordering, AtomicBool};
 
 use database::{Fingerprint, Database};
 use openpgp::tpk::{TPKBuilder, UserIDBinding};
-use openpgp::{Packet, UserID, TPK, PacketPile};
+use openpgp::{Packet, packet::UserID, TPK, PacketPile};
 use base64;
 
 pub fn test_uid_verification<D: Database>(db: &mut D) {