diff --git a/gpg/diaspora-test/trustdb.gpg b/gpg/diaspora-test/trustdb.gpg
index fd495fd34..6df22b2fd 100644
Binary files a/gpg/diaspora-test/trustdb.gpg and b/gpg/diaspora-test/trustdb.gpg differ
diff --git a/lib/diaspora/ostatus_parser.rb b/lib/diaspora/ostatus_parser.rb
index 11deefcc0..5cf126f8f 100644
--- a/lib/diaspora/ostatus_parser.rb
+++ b/lib/diaspora/ostatus_parser.rb
@@ -4,15 +4,17 @@ module Diaspora
     def self.process(xml)
       doc = Nokogiri::HTML(xml)
 
-      author_hash = self.author(doc)
-      author_hash[:hub] = self.hub(doc) 
+      hash = {}
+      hash[:author] = self.author(doc)
+      hash[:author][:hub] = self.hub(doc) 
 
-      entry_hash = self.entry(doc)
+      hash[:entry] = self.entry(doc)
 
-      author = Author.instantiate(author_hash)
-      author.ostatus_posts.create(entry_hash) if entry_hash[:message]
+      author = Author.instantiate(hash[:author])
+      author.ostatus_posts.create(hash[:entry]) if hash[:entry][:message]
     end
 
+
     def self.author(doc)
       return { 
         :service          => self.service(doc),