diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 573c430..21414f2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -780,7 +780,7 @@ void cmMakefile::SetLocalGenerator(cmLocalGenerator* lg)
   this->AddSourceGroup
     ("Source Files",
      "\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp"
-     "|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$");
+     "|ftn|m|mm|rc|def|r|odl|idl|hpj|bat|asm)$");
   this->AddSourceGroup("Header Files",
                        "\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$");
   this->AddSourceGroup("CMake Rules", "\\.rule$");
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 551b0ad..f9afa6f 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -497,7 +497,7 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
       {
       resource.push_back(sf);
       }
-    else if(sf->GetCustomCommand())
+    else if(sf->GetCustomCommand() || lang && strstr(lang, "ASM") == lang)
       {
       customBuild.push_back(sf);
       }
@@ -707,6 +707,45 @@ void cmVisualStudio10TargetGenerator::WriteObjSources()
     }
 }
 
+bool cmVisualStudio10TargetGenerator::OutputAsmSourceCommand(cmSourceFile *source)
+{
+  std::string sourceFile = source->GetFullPath();
+  this->ConvertToWindowsSlash(sourceFile);
+  const char* lang = source->GetLanguage();
+  (*this->BuildFileStream) << ">\n";
+  cmLocalVisualStudio7Generator* lg = this->LocalGenerator;
+  std::string dir_max;
+  lg->ComputeMaxDirectoryLength(dir_max, *this->Target);
+  this->WriteString("<Message>", 4);
+  (*this->BuildFileStream) << source->GetLocation().GetName() << "</Message>\n";
+  this->WriteString("<Command>", 4);
+  std::string varCompileObject = std::string("CMAKE_") + lang
+    + "_COMPILE_OBJECT";
+  std::string varFlags = std::string("CMAKE_") + lang + "_FLAGS";
+  std::string varCompiler = std::string("CMAKE_") + lang + "_COMPILER";
+  std::string compileObject = this->Makefile->GetRequiredDefinition(
+    varCompileObject.c_str());
+  std::string flags = this->Makefile->GetRequiredDefinition(
+    varFlags.c_str());
+  std::string compiler = this->Makefile->GetRequiredDefinition(
+    varCompiler.c_str());
+  if (source->GetProperty("COMPILE_FLAGS"))
+    {
+    this->LocalGenerator->AppendFlags(flags,
+      source->GetProperty("COMPILE_FLAGS"));
+    }
+  cmLocalGenerator::RuleVariables vars;
+  vars.Source = sourceFile.c_str();
+  std::string objectName = std::string("$(IntDir)\\")
+    + lg->GetObjectFileNameWithoutTarget(*source, dir_max);
+  vars.Object = objectName.c_str();
+  vars.Flags = flags.c_str();
+  this->LocalGenerator->ExpandRuleVariables(compileObject, vars);
+  (*this->BuildFileStream) << compileObject << "</Command>\n";
+  this->WriteString("<Outputs>", 4);
+  (*this->BuildFileStream) << objectName << "</Outputs>\n";
+  return true;
+}
 
 void cmVisualStudio10TargetGenerator::WriteCLSources()
 {
@@ -732,6 +771,7 @@ void cmVisualStudio10TargetGenerator::WriteCLSources()
     bool cl = lang && (strcmp(lang, "C") == 0 || strcmp(lang, "CXX") ==0);
     bool rc = lang && (strcmp(lang, "RC") == 0);
     bool idl = ext == "idl";
+    bool lang_asm = lang && (strstr(lang, "ASM") == lang);
     std::string sourceFile = (*source)->GetFullPath();
     // do not use a relative path here because it means that you
     // can not use as long a path to the file.
@@ -753,6 +793,10 @@ void cmVisualStudio10TargetGenerator::WriteCLSources()
       {
       this->WriteString("<Midl Include=\"", 2);
       }
+    else if (lang_asm)
+      {
+      this->WriteString("<CustomBuild Include=\"", 2);
+      }
     else
       {
       this->WriteString("<None Include=\"", 2);
@@ -769,6 +813,10 @@ void cmVisualStudio10TargetGenerator::WriteCLSources()
       {
       this->WriteString("</ResourceCompile>\n", 2);
       }
+    else if (lang_asm && this->OutputAsmSourceCommand(*source))
+      {
+      this->WriteString("</CustomBuild>\n", 2);
+      }
     else
       {
       (*this->BuildFileStream ) << " />\n";
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h
index c3c27f4..72b1832 100644
--- a/Source/cmVisualStudio10TargetGenerator.h
+++ b/Source/cmVisualStudio10TargetGenerator.h
@@ -68,6 +68,7 @@ private:
   void WriteGroups();
   void WriteProjectReferences();
   bool OutputSourceSpecificFlags(cmSourceFile* source);
+  bool OutputAsmSourceCommand(cmSourceFile* source);
   void AddLibraries(cmComputeLinkInformation& cli, std::string& libstring);
   void WriteLibOptions(std::string const& config);
   void WriteEvents(std::string const& configName);