diff --git a/go/Makefile b/go/Makefile
index 289bd122..adc243af 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -1,4 +1,4 @@
-include $(GOROOT)/src/Make.$(GOARCH)
+include $(GOROOT)/src/Make.inc
 
 TARG=msgpack
 
diff --git a/go/pack.go b/go/pack.go
index f23652e3..aadd7f93 100644
--- a/go/pack.go
+++ b/go/pack.go
@@ -132,16 +132,6 @@ func PackFloat64(writer io.Writer, value float64) (n int, err os.Error) {
     return PackUint64(writer, *(*uint64)(unsafe.Pointer(&value)))
 }
 
-func PackFloat(writer io.Writer, value float) (n int, err os.Error) {
-    switch unsafe.Sizeof(value) {
-    case 4:
-        return PackFloat32(writer, *(*float32)(unsafe.Pointer(&value)))
-    case 8:
-        return PackFloat64(writer, *(*float64)(unsafe.Pointer(&value)))
-    }
-    return 0, os.ENOENT // never get here
-}
-
 func PackBytes(writer io.Writer, value []byte) (n int, err os.Error) {
     if len(value) < 32 {
         n1, err := writer.Write([]byte { 0xa0 | uint8(len(value)) })
@@ -441,16 +431,6 @@ func PackFloat64Array(writer io.Writer, value []float64) (n int, err os.Error) {
     return n, nil
 }
 
-func PackFloatArray(writer io.Writer, value []float) (n int, err os.Error) {
-    switch unsafe.Sizeof(0) {
-    case 4:
-        return PackFloat32Array(writer, *(*[]float32)(unsafe.Pointer(&value)))
-    case 8:
-        return PackFloat64Array(writer, *(*[]float64)(unsafe.Pointer(&value)))
-    }
-    return 0, os.ENOENT // never get here
-}
-
 func PackArray(writer io.Writer, value reflect.ArrayOrSliceValue) (n int, err os.Error) {
     {
         elemType, ok := value.Type().(reflect.ArrayOrSliceType).Elem().(*reflect.UintType)
@@ -563,7 +543,6 @@ func Pack(writer io.Writer, value interface{}) (n int, err os.Error) {
     case int: return PackInt(writer, _value)
     case float32: return PackFloat32(writer, _value)
     case float64: return PackFloat64(writer, _value)
-    case float: return PackFloat(writer, _value)
     case []byte: return PackBytes(writer, _value)
     case []uint16: return PackUint16Array(writer, _value)
     case []uint32: return PackUint32Array(writer, _value)
@@ -576,7 +555,6 @@ func Pack(writer io.Writer, value interface{}) (n int, err os.Error) {
     case []int: return PackIntArray(writer, _value)
     case []float32: return PackFloat32Array(writer, _value)
     case []float64: return PackFloat64Array(writer, _value)
-    case []float: return PackFloatArray(writer, _value)
     default:
         return PackValue(writer, reflect.NewValue(value))
     }