diff --git a/mayan/apps/metadata/__init__.py b/mayan/apps/metadata/__init__.py
index 485f8e0af5..e495204f51 100644
--- a/mayan/apps/metadata/__init__.py
+++ b/mayan/apps/metadata/__init__.py
@@ -1,10 +1,14 @@
 from __future__ import absolute_import
 
+import logging
+
+from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _
 
 from acls.api import class_permissions
 from common.utils import encapsulate
 from documents.models import Document, DocumentType
+from documents.signals import post_document_type_change
 from navigation.api import register_links, register_model_list_columns
 from navigation.links import link_spacer
 from project_setup.api import register_setup
@@ -24,6 +28,8 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_ADD,
                           PERMISSION_METADATA_DOCUMENT_VIEW)
 from .urls import api_urls
 
+logger = logging.getLogger(__name__)
+
 
 @property
 def document_type_metadata(self):
@@ -33,6 +39,19 @@ def document_type_metadata(self):
         return MetadataType.objects.none()
 
 
+@receiver(post_document_type_change, dispatch_uid='post_post_document_type_change_metadata', sender=Document)
+def post_post_document_type_change_metadata(sender, instance, **kwargs):
+    logger.debug('received post_document_type_change')
+    logger.debug('instance: %s' % instance)
+    # Delete existing document metadata
+    for metadata in instance.metadata.all():
+        metadata.delete()
+
+    # Add new document type metadata types to document
+    for metadata_type in instance.document_type.metadata.all():
+        instance.metadata.create(metadata_type=metadata_type, value=None)
+
+
 DocumentType.add_to_class('metadata', document_type_metadata)
 
 register_links(['metadata:metadata_add', 'metadata:metadata_edit', 'metadata:metadata_remove', 'metadata:metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar')
@@ -42,7 +61,6 @@ register_links(MetadataType, [setup_metadata_type_edit, setup_metadata_type_dele
 register_links([MetadataType, 'metadata:setup_metadata_type_list', 'metadata:setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu')
 register_links([Document], [link_spacer, metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove], menu_name='multi_item_links')
 
-
 register_setup(setup_metadata_type_list)
 
 class_permissions(Document, [
diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py
index 6097037b4b..81abc3c651 100644
--- a/mayan/apps/metadata/models.py
+++ b/mayan/apps/metadata/models.py
@@ -47,7 +47,7 @@ class DocumentMetadata(models.Model):
     """
     document = models.ForeignKey(Document, verbose_name=_(u'Document'), related_name='metadata')
     metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'Type'))
-    value = models.CharField(max_length=255, blank=True, verbose_name=_(u'Value'), db_index=True)
+    value = models.CharField(max_length=255, blank=True, null=True, verbose_name=_(u'Value'), db_index=True)
 
     def __unicode__(self):
         return unicode(self.metadata_type)
diff --git a/mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py b/mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py
new file mode 100644
index 0000000000..fdf18cc3f0
--- /dev/null
+++ b/mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'DocumentMetadata.value'
+        db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=255, null=True))
+
+    def backwards(self, orm):
+
+        # Changing field 'DocumentMetadata.value'
+        db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(default='', max_length=255))
+
+    models = {
+        u'documents.document': {
+            'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'},
+            'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'document_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'documents'", 'to': u"orm['documents.DocumentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'label': ('django.db.models.fields.CharField', [], {'default': "u'Uninitialized document'", 'max_length': '255', 'db_index': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'default': "u'eng'", 'max_length': '8'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'default': "u'fe2e53a3-f1b5-4703-b151-1716e70dbd36'", 'max_length': '48'})
+        },
+        u'documents.documenttype': {
+            'Meta': {'ordering': "['name']", 'object_name': 'DocumentType'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}),
+            'ocr': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+        },
+        u'metadata.documentmetadata': {
+            'Meta': {'object_name': 'DocumentMetadata'},
+            'document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'metadata'", 'to': u"orm['documents.Document']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'metadata_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['metadata.MetadataType']"}),
+            'value': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        u'metadata.documenttypedefaults': {
+            'Meta': {'object_name': 'DocumentTypeDefaults'},
+            'default_metadata': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['metadata.MetadataType']", 'symmetrical': 'False', 'blank': 'True'}),
+            'document_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.DocumentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        u'metadata.metadatatype': {
+            'Meta': {'ordering': "('title',)", 'object_name': 'MetadataType'},
+            'default': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lookup': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '48'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '48', 'null': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['metadata']
\ No newline at end of file