diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c392083e80..0a301bfa40 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-20 20:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/c.mk
+  * config/rules.mk
+    + Added support for Objective C input files (.m)
+
 2011-01-20 19:09 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   + contrib/hbct/misc4.c
   * contrib/hbct/dummy.c
diff --git a/harbour/config/c.mk b/harbour/config/c.mk
index 4900c7aa5b..f6a7e8cc28 100644
--- a/harbour/config/c.mk
+++ b/harbour/config/c.mk
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-C_OBJS := $(C_SOURCES:.c=$(OBJ_EXT)) $(CPP_SOURCES:.cpp=$(OBJ_EXT))
+C_OBJS := $(C_SOURCES:.c=$(OBJ_EXT)) $(CPP_SOURCES:.cpp=$(OBJ_EXT)) $(OBJC_SOURCES:.m=$(OBJ_EXT))
 S_OBJS := $(S_SOURCES:.s=$(OBJ_EXT)) $(SX_SOURCES:.sx=$(OBJ_EXT))
 
 C_MAIN_OBJ := $(C_MAIN:.c=$(OBJ_EXT))
diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk
index 215c3f6a9f..62ad25b01d 100644
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -71,6 +71,12 @@ ifeq ($(CPP_RULE),)
    CPP_RULE = $(CXX) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.cpp=$(OBJ_EXT)) $(CC_IN) $<
 endif
 
+# The rule to compile an Objective C source file.
+ifeq ($(OBJC_RULE),)
+   OBJC := $(CC)
+   OBJC_RULE = $(OBJC) $(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.m=$(OBJ_EXT)) $(CC_IN) $<
+endif
+
 # The rule to compile resources.
 ifneq ($(RC),)
    ifeq ($(RC_RULE),)
@@ -101,6 +107,13 @@ endif
 %$(OBJ_EXT) : %.cpp
 	$(CPP_RULE)
 
+# Rules for Objective C files
+%$(OBJ_EXT) : $(GRANDP)%.m
+	$(OBJC_RULE)
+
+%$(OBJ_EXT) : %.m
+	$(OBJC_RULE)
+
 # Rules for resource files
 %$(RES_EXT) : $(GRANDP)%.rc
 	$(RC_RULE)