diff --git a/native/dispatch.c b/native/dispatch.c
index 3712e12e87..2da47aafc0 100644
--- a/native/dispatch.c
+++ b/native/dispatch.c
@@ -310,6 +310,7 @@ w32_short_name(JNIEnv* env, jstring str) {
 
 static HANDLE
 w32_find_entry(JNIEnv* env, HANDLE handle, const char* funname) {
+  if (funname && funname[0] == '#') funname = (const char *)atoi(funname + 1);
   void* func = NULL;
   if (handle != GetModuleHandle(NULL)) {
     func = GetProcAddress(handle, funname);
diff --git a/test/com/sun/jna/win32/W32OrdinalNumberFunctionTest.java b/test/com/sun/jna/win32/W32OrdinalNumberFunctionTest.java
new file mode 100644
index 0000000000..114217f15f
--- /dev/null
+++ b/test/com/sun/jna/win32/W32OrdinalNumberFunctionTest.java
@@ -0,0 +1,60 @@
+package com.sun.jna.win32;
+
+import com.sun.jna.FunctionMapper;
+import com.sun.jna.Library;
+import com.sun.jna.Native;
+import com.sun.jna.NativeLibrary;
+import junit.framework.TestCase;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+public class W32OrdinalNumberFunctionTest extends TestCase {
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(W32OrdinalNumberFunctionTest.class);
+    }
+
+    @Target({ElementType.METHOD})
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface FuncName {
+        String value();
+    }
+
+    public interface CLibrary extends Library {
+        @FuncName("#1206")
+        double sin(double x);
+    }
+
+    CLibrary c;
+
+    public class MyFunctionMapper implements FunctionMapper {
+        @Override
+        public String getFunctionName(NativeLibrary library, Method method) {
+            FuncName fn = method.getAnnotation(FuncName.class);
+            return fn == null ? method.getName() : fn.value();
+        }
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        Map map = new HashMap();
+        map.put(Library.OPTION_FUNCTION_MAPPER, new MyFunctionMapper());
+        c = (CLibrary) Native.loadLibrary("msvcrt", CLibrary.class, map);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        c = null;
+    }
+
+    public void testOrdinalNumberFunction() {
+        double y = c.sin(Math.PI / 2);
+        assertTrue(Math.abs(y - 1) < 0.0001);
+    }
+}