diff --git a/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/DynamicComponentMappingTests.cs b/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/DynamicComponentMappingTests.cs
index 6b2c1749171..78249339d73 100644
--- a/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/DynamicComponentMappingTests.cs
+++ b/src/NHibernate.Test/MappingByCode/ExplicitMappingTests/DynamicComponentMappingTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping.ByCode;
@@ -20,6 +21,42 @@ public IDictionary Info
 			}
 		}
 
+		[Test]
+		public void WhenMapDynCompoByDictionaryThenMapItAndItsProperties()
+		{
+			//NH-3704
+			var mapper = new ModelMapper();
+			mapper.Class<Person>(map =>
+			{
+				map.Id(x => x.Id, idmap => { });
+				map.Component(x => x.Info, new Dictionary<string, System.Type> { { "MyInt", typeof(int) }, { "MyDate", typeof(DateTime) } }, z => { });
+			});
+
+			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Person) });
+			var hbmClass = hbmMapping.RootClasses[0];
+			var hbmDynamicComponent = hbmClass.Properties.OfType<HbmDynamicComponent>().SingleOrDefault();
+			Assert.That(hbmDynamicComponent, Is.Not.Null);
+			Assert.That(hbmDynamicComponent.Properties.Select(x => x.Name), Is.EquivalentTo(new[] { "MyInt", "MyDate" }));
+		}
+
+		[Test]
+		public void WhenMapPrivateDynCompoByDictionaryThenMapItAndItsProperties()
+		{
+			//NH-3704
+			var mapper = new ModelMapper();
+			mapper.Class<Person>(map =>
+			{
+				map.Id(x => x.Id, idmap => { });
+				map.Component("Info", new Dictionary<string, System.Type> { { "MyInt", typeof(int) }, { "MyDate", typeof(DateTime) } }, z => { });
+			});
+
+			var hbmMapping = mapper.CompileMappingFor(new[] { typeof(Person) });
+			var hbmClass = hbmMapping.RootClasses[0];
+			var hbmDynamicComponent = hbmClass.Properties.OfType<HbmDynamicComponent>().SingleOrDefault();
+			Assert.That(hbmDynamicComponent, Is.Not.Null);
+			Assert.That(hbmDynamicComponent.Properties.Select(x => x.Name), Is.EquivalentTo(new[] { "MyInt", "MyDate" }));
+		}
+
 		[Test]
 		public void WhenMapDynCompoThenMapItAndItsProperties()
 		{
diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs
index d409c6d57ee..a813f3fd765 100644
--- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs
+++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/DynamicComponentCustomizer.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
 
 namespace NHibernate.Mapping.ByCode.Impl.CustomizersImpl
 {
@@ -18,6 +21,55 @@ public DynamicComponentCustomizer(IModelExplicitDeclarationsHolder explicitDecla
 			explicitDeclarationsHolder.AddAsDynamicComponent(propertyPath.LocalMember, typeof(TComponent));
 		}
 
+		public DynamicComponentCustomizer(IDictionary<string, System.Type> template, IModelExplicitDeclarationsHolder explicitDeclarationsHolder, ICustomizersHolder customizersHolder, PropertyPath propertyPath)
+			: base(explicitDeclarationsHolder, customizersHolder, propertyPath)
+		{
+			if (propertyPath == null)
+			{
+				throw new ArgumentNullException("propertyPath");
+			}
+			if (explicitDeclarationsHolder == null)
+			{
+				throw new ArgumentNullException("explicitDeclarationsHolder");
+			}
+
+			var componentType = this.CreateType(template);
+
+			explicitDeclarationsHolder.AddAsDynamicComponent(propertyPath.LocalMember, componentType);
+		}
+
+		private System.Type CreateType(IDictionary<string, System.Type> properties)
+		{
+			var assemblyName = new AssemblyName("MyDynamicAssembly");
+			var assemblyBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
+			var moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name);
+			var typeBuilder = moduleBuilder.DefineType("MyDynamicType", TypeAttributes.Public | TypeAttributes.Serializable);
+
+			foreach (var property in properties)
+			{
+				var propertyBuilder = typeBuilder.DefineProperty(property.Key, PropertyAttributes.HasDefault, property.Value, null);
+				var getMethodBuilder = typeBuilder.DefineMethod("get_" + property.Key, MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig, property.Value, System.Type.EmptyTypes);
+				var setMethodBuilder = typeBuilder.DefineMethod("set_" + property.Key, MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.HideBySig, typeof(void), new System.Type[] { property.Value });
+
+				var getILGenerator = getMethodBuilder.GetILGenerator();
+				getILGenerator.Emit(OpCodes.Ldarg_0);
+				getILGenerator.Emit(OpCodes.Nop);
+				getILGenerator.Emit(OpCodes.Ret);
+
+				var setILGenerator = setMethodBuilder.GetILGenerator();
+				setILGenerator.Emit(OpCodes.Ldarg_0);
+				setILGenerator.Emit(OpCodes.Ldarg_1);
+				setILGenerator.Emit(OpCodes.Ret);
+
+				propertyBuilder.SetGetMethod(getMethodBuilder);
+				propertyBuilder.SetSetMethod(setMethodBuilder);
+			}
+
+			var type = typeBuilder.CreateType();
+
+			return type;
+		}
+
 		#region IDynamicComponentMapper<TComponent> Members
 
 		public void Access(Accessor accessor)
diff --git a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
index b3119f6244a..d2f031fa547 100644
--- a/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
+++ b/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
@@ -95,7 +95,14 @@ protected void RegisterComponentMapping<TComponent>(Action<IComponentMapper<TCom
 
 		public void Component<TComponent>(Expression<Func<TEntity, IDictionary>> property, TComponent dynamicComponentTemplate, Action<IDynamicComponentMapper<TComponent>> mapping)
 		{
-			RegisterDynamicComponentMapping(property, mapping);
+			if (dynamicComponentTemplate is IDictionary<string, System.Type>)
+			{
+				RegisterDynamicComponentMapping<TComponent>(property, dynamicComponentTemplate as IDictionary<string, System.Type>, mapping);
+			}
+			else
+			{
+				RegisterDynamicComponentMapping(property, mapping);
+			}
 		}
 
 		protected virtual void RegisterDynamicComponentMapping<TComponent>(Expression<Func<TEntity, IDictionary>> property, Action<IDynamicComponentMapper<TComponent>> mapping)
@@ -105,6 +112,21 @@ protected virtual void RegisterDynamicComponentMapping<TComponent>(Expression<Fu
 			RegisterDynamicComponentMapping(mapping, member, memberOf);
 		}
 
+		protected virtual void RegisterDynamicComponentMapping<TComponent>(Expression<Func<TEntity, IDictionary>> property, IDictionary<string, System.Type> template, Action<IDynamicComponentMapper<TComponent>> mapping) 
+		{
+			MemberInfo member = TypeExtensions.DecodeMemberAccessExpression(property);
+			MemberInfo memberOf = TypeExtensions.DecodeMemberAccessExpressionOf(property);
+			RegisterDynamicComponentMapping<TComponent>(template, mapping, member, memberOf);
+		}
+
+		protected void RegisterDynamicComponentMapping<TComponent>(IDictionary<string, System.Type> template, Action<IDynamicComponentMapper<TComponent>> mapping, params MemberInfo[] members)
+		{
+			foreach (var member in members)
+			{
+				mapping(new DynamicComponentCustomizer<TComponent>(template, explicitDeclarationsHolder, CustomizersHolder, new PropertyPath(PropertyPath, member)));
+			}
+		}
+
 		protected void RegisterDynamicComponentMapping<TComponent>(Action<IDynamicComponentMapper<TComponent>> mapping, params MemberInfo[] members)
 		{
 			foreach (var member in members)
@@ -479,7 +501,15 @@ public void Component<TComponent>(string notVisiblePropertyOrFieldName, TCompone
 		{
 			MemberInfo member = GetPropertyOrFieldMatchingNameOrThrow(notVisiblePropertyOrFieldName);
 			MemberInfo memberOf = member.GetMemberFromReflectedType(typeof(TEntity));
-			RegisterDynamicComponentMapping<TComponent>(mapping, member, memberOf);
+
+			if (dynamicComponentTemplate is IDictionary<string, System.Type>)
+			{
+				RegisterDynamicComponentMapping<TComponent>(dynamicComponentTemplate as IDictionary<string, System.Type>, mapping, member, memberOf);
+			}
+			else
+			{
+				RegisterDynamicComponentMapping<TComponent>(mapping, member, memberOf);
+			}
 		}
 
 		public void Any<TProperty>(string notVisiblePropertyOrFieldName, System.Type idTypeOfMetaType, Action<IAnyMapper> mapping) where TProperty : class
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
index 19b538de969..7950b5ab0a4 100644
--- a/src/NHibernate/NHibernate.csproj
+++ b/src/NHibernate/NHibernate.csproj
@@ -90,6 +90,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">