diff --git a/articlegenerator/extract.py b/articlegenerator/extract.py
index 7e79cfe..2e224c7 100644
--- a/articlegenerator/extract.py
+++ b/articlegenerator/extract.py
@@ -48,8 +48,12 @@ def collect(self):
         # Get kernel version
         data_rec['kernel_version'] = drp.get_kernel_version()
 
-        # Get metadata md5
-        data_rec['metadata_md5'] = drp.get_metadata_md5()
+        metadata = drp.get_metadata_file()
+        # Get metadata file
+        data_rec['metadata_file'] = {
+                                      'filename': metadata.get_filename(),
+                                      'data': metadata.get_contents(),
+                                    }
 
         # Get RPM information
         rpm_data = []
diff --git a/articlegenerator/tests/extract_tests.py b/articlegenerator/tests/extract_tests.py
index 050883b..e68eef0 100644
--- a/articlegenerator/tests/extract_tests.py
+++ b/articlegenerator/tests/extract_tests.py
@@ -53,7 +53,13 @@ def setUp(self):
                                 'filesize': '59693',
                                },
                         'ctx': 'CTXTestNumber',
-                        'metadata_md5': 'metadata_md5',
+                        'metadata_file': {
+                                           'filename': 'test.metadata.md5',
+                                           'fileloc': '/tmp/test.metadata.md5',
+                                           'data': '23523582358235235',
+                                           'md5': 'asdfasdfasdf',
+                                           'filesize': '124124',
+                                         },
                         'driver_rpms': [
                                         {
                                           'filename':'test-rpm-1.rpm',
@@ -111,7 +117,8 @@ def test_get_iso(self):
         self.assertEqual(data['zip']['md5'], mock_data['zip']['md5'])
 
         self.assertEqual(data['kernel_version'], mock_data['kernel_version'])
-        self.assertEqual(data['metadata_md5'], mock_data['metadata_md5'])
+        self.assertEqual(data['metadata_file']['filename'], mock_data['metadata_file']['filename'])
+        self.assertEqual(data['metadata_file']['data'], mock_data['metadata_file']['data'])
 
         #Verify RPM data
         assert len(mock_data['driver_rpms']) + \
diff --git a/driverfiles/mock_models.py b/driverfiles/mock_models.py
index 1ac5245..358cf51 100644
--- a/driverfiles/mock_models.py
+++ b/driverfiles/mock_models.py
@@ -65,8 +65,8 @@ def get_zip(self):
     def get_ctx(self):
         return self.mock_rec['ctx']   
     
-    def get_metadata_md5(self):
-        return self.mock_rec['metadata_md5']
+    def get_metadata_file(self):
+        return MockBinaryFile(self.mock_rec['metadata_file'])
 
     def get_rpms(self):
         driver_rpms = []
diff --git a/driverfiles/models.py b/driverfiles/models.py
index 808a446..eeb4f92 100644
--- a/driverfiles/models.py
+++ b/driverfiles/models.py
@@ -156,8 +156,8 @@ def get_zip(self):
     def get_ctx(self):
         return self.attrs.group('ctx')
 
-    def get_metadata_md5(self):
-        return self.metadata_file.get_contents()
+    def get_metadata_file(self):
+        return self.metadata_file
 
     def get_rpms(self):
         driver_rpms = []
diff --git a/driverfiles/tests/file_tests.py b/driverfiles/tests/file_tests.py
index cbe4b55..bd4ab4a 100644
--- a/driverfiles/tests/file_tests.py
+++ b/driverfiles/tests/file_tests.py
@@ -166,7 +166,7 @@ def test_get_zip(self):
     
     def test_get_metadata_md5(self):
         drp = models.DriverRepoPackage(self.directory)
-        metadata_md5 = drp.get_metadata_md5()
+        metadata_md5 = drp.get_metadata_file().get_contents()
         assert_equal(self.sample_data['metadata_md5'], metadata_md5)
         
     def test_verify_driver_versions(self):