diff --git a/imports/mkstdlib.go b/imports/mkstdlib.go
index 62f3321..1e559e9 100644
--- a/imports/mkstdlib.go
+++ b/imports/mkstdlib.go
@@ -51,6 +51,7 @@
 		mustOpen(api("go1.4.txt")),
 		mustOpen(api("go1.5.txt")),
 		mustOpen(api("go1.6.txt")),
+		mustOpen(api("go1.7.txt")),
 	)
 	sc := bufio.NewScanner(f)
 	fullImport := map[string]string{} // "zip.NewReader" => "archive/zip"
diff --git a/imports/zstdlib.go b/imports/zstdlib.go
index eb89b2d..28835da 100644
--- a/imports/zstdlib.go
+++ b/imports/zstdlib.go
@@ -271,6 +271,8 @@
 	"bytes.Buffer":                                  "bytes",
 	"bytes.Compare":                                 "bytes",
 	"bytes.Contains":                                "bytes",
+	"bytes.ContainsAny":                             "bytes",
+	"bytes.ContainsRune":                            "bytes",
 	"bytes.Count":                                   "bytes",
 	"bytes.Equal":                                   "bytes",
 	"bytes.EqualFold":                               "bytes",
@@ -435,6 +437,16 @@
 	"constant.Uint64Val":                            "go/constant",
 	"constant.UnaryOp":                              "go/constant",
 	"constant.Unknown":                              "go/constant",
+	"context.Background":                            "context",
+	"context.CancelFunc":                            "context",
+	"context.Canceled":                              "context",
+	"context.Context":                               "context",
+	"context.DeadlineExceeded":                      "context",
+	"context.TODO":                                  "context",
+	"context.WithCancel":                            "context",
+	"context.WithDeadline":                          "context",
+	"context.WithTimeout":                           "context",
+	"context.WithValue":                             "context",
 	"cookiejar.Jar":                                 "net/http/cookiejar",
 	"cookiejar.New":                                 "net/http/cookiejar",
 	"cookiejar.Options":                             "net/http/cookiejar",
@@ -980,6 +992,68 @@
 	"elf.R_386_TLS_LE_32":                           "debug/elf",
 	"elf.R_386_TLS_TPOFF":                           "debug/elf",
 	"elf.R_386_TLS_TPOFF32":                         "debug/elf",
+	"elf.R_390":                                     "debug/elf",
+	"elf.R_390_12":                                  "debug/elf",
+	"elf.R_390_16":                                  "debug/elf",
+	"elf.R_390_20":                                  "debug/elf",
+	"elf.R_390_32":                                  "debug/elf",
+	"elf.R_390_64":                                  "debug/elf",
+	"elf.R_390_8":                                   "debug/elf",
+	"elf.R_390_COPY":                                "debug/elf",
+	"elf.R_390_GLOB_DAT":                            "debug/elf",
+	"elf.R_390_GOT12":                               "debug/elf",
+	"elf.R_390_GOT16":                               "debug/elf",
+	"elf.R_390_GOT20":                               "debug/elf",
+	"elf.R_390_GOT32":                               "debug/elf",
+	"elf.R_390_GOT64":                               "debug/elf",
+	"elf.R_390_GOTENT":                              "debug/elf",
+	"elf.R_390_GOTOFF":                              "debug/elf",
+	"elf.R_390_GOTOFF16":                            "debug/elf",
+	"elf.R_390_GOTOFF64":                            "debug/elf",
+	"elf.R_390_GOTPC":                               "debug/elf",
+	"elf.R_390_GOTPCDBL":                            "debug/elf",
+	"elf.R_390_GOTPLT12":                            "debug/elf",
+	"elf.R_390_GOTPLT16":                            "debug/elf",
+	"elf.R_390_GOTPLT20":                            "debug/elf",
+	"elf.R_390_GOTPLT32":                            "debug/elf",
+	"elf.R_390_GOTPLT64":                            "debug/elf",
+	"elf.R_390_GOTPLTENT":                           "debug/elf",
+	"elf.R_390_GOTPLTOFF16":                         "debug/elf",
+	"elf.R_390_GOTPLTOFF32":                         "debug/elf",
+	"elf.R_390_GOTPLTOFF64":                         "debug/elf",
+	"elf.R_390_JMP_SLOT":                            "debug/elf",
+	"elf.R_390_NONE":                                "debug/elf",
+	"elf.R_390_PC16":                                "debug/elf",
+	"elf.R_390_PC16DBL":                             "debug/elf",
+	"elf.R_390_PC32":                                "debug/elf",
+	"elf.R_390_PC32DBL":                             "debug/elf",
+	"elf.R_390_PC64":                                "debug/elf",
+	"elf.R_390_PLT16DBL":                            "debug/elf",
+	"elf.R_390_PLT32":                               "debug/elf",
+	"elf.R_390_PLT32DBL":                            "debug/elf",
+	"elf.R_390_PLT64":                               "debug/elf",
+	"elf.R_390_RELATIVE":                            "debug/elf",
+	"elf.R_390_TLS_DTPMOD":                          "debug/elf",
+	"elf.R_390_TLS_DTPOFF":                          "debug/elf",
+	"elf.R_390_TLS_GD32":                            "debug/elf",
+	"elf.R_390_TLS_GD64":                            "debug/elf",
+	"elf.R_390_TLS_GDCALL":                          "debug/elf",
+	"elf.R_390_TLS_GOTIE12":                         "debug/elf",
+	"elf.R_390_TLS_GOTIE20":                         "debug/elf",
+	"elf.R_390_TLS_GOTIE32":                         "debug/elf",
+	"elf.R_390_TLS_GOTIE64":                         "debug/elf",
+	"elf.R_390_TLS_IE32":                            "debug/elf",
+	"elf.R_390_TLS_IE64":                            "debug/elf",
+	"elf.R_390_TLS_IEENT":                           "debug/elf",
+	"elf.R_390_TLS_LDCALL":                          "debug/elf",
+	"elf.R_390_TLS_LDM32":                           "debug/elf",
+	"elf.R_390_TLS_LDM64":                           "debug/elf",
+	"elf.R_390_TLS_LDO32":                           "debug/elf",
+	"elf.R_390_TLS_LDO64":                           "debug/elf",
+	"elf.R_390_TLS_LE32":                            "debug/elf",
+	"elf.R_390_TLS_LE64":                            "debug/elf",
+	"elf.R_390_TLS_LOAD":                            "debug/elf",
+	"elf.R_390_TLS_TPOFF":                           "debug/elf",
 	"elf.R_AARCH64":                                 "debug/elf",
 	"elf.R_AARCH64_ABS16":                           "debug/elf",
 	"elf.R_AARCH64_ABS32":                           "debug/elf",
@@ -1577,6 +1651,7 @@
 	"errors.New":                                    "errors",
 	"exec.Cmd":                                      "os/exec",
 	"exec.Command":                                  "os/exec",
+	"exec.CommandContext":                           "os/exec",
 	"exec.ErrNotFound":                              "os/exec",
 	"exec.Error":                                    "os/exec",
 	"exec.ExitError":                                "os/exec",
@@ -1666,6 +1741,7 @@
 	"flate.BestSpeed":                               "compress/flate",
 	"flate.CorruptInputError":                       "compress/flate",
 	"flate.DefaultCompression":                      "compress/flate",
+	"flate.HuffmanOnly":                             "compress/flate",
 	"flate.InternalError":                           "compress/flate",
 	"flate.NewReader":                               "compress/flate",
 	"flate.NewReaderDict":                           "compress/flate",
@@ -1802,6 +1878,7 @@
 	"http.ErrShortBody":                             "net/http",
 	"http.ErrSkipAltProtocol":                       "net/http",
 	"http.ErrUnexpectedTrailer":                     "net/http",
+	"http.ErrUseLastResponse":                       "net/http",
 	"http.ErrWriteAfterFlush":                       "net/http",
 	"http.Error":                                    "net/http",
 	"http.File":                                     "net/http",
@@ -1818,6 +1895,7 @@
 	"http.Hijacker":                                 "net/http",
 	"http.ListenAndServe":                           "net/http",
 	"http.ListenAndServeTLS":                        "net/http",
+	"http.LocalAddrContextKey":                      "net/http",
 	"http.MaxBytesReader":                           "net/http",
 	"http.MethodConnect":                            "net/http",
 	"http.MethodDelete":                             "net/http",
@@ -1853,6 +1931,7 @@
 	"http.ServeFile":                                "net/http",
 	"http.ServeMux":                                 "net/http",
 	"http.Server":                                   "net/http",
+	"http.ServerContextKey":                         "net/http",
 	"http.SetCookie":                                "net/http",
 	"http.StateActive":                              "net/http",
 	"http.StateClosed":                              "net/http",
@@ -1860,34 +1939,44 @@
 	"http.StateIdle":                                "net/http",
 	"http.StateNew":                                 "net/http",
 	"http.StatusAccepted":                           "net/http",
+	"http.StatusAlreadyReported":                    "net/http",
 	"http.StatusBadGateway":                         "net/http",
 	"http.StatusBadRequest":                         "net/http",
 	"http.StatusConflict":                           "net/http",
 	"http.StatusContinue":                           "net/http",
 	"http.StatusCreated":                            "net/http",
 	"http.StatusExpectationFailed":                  "net/http",
+	"http.StatusFailedDependency":                   "net/http",
 	"http.StatusForbidden":                          "net/http",
 	"http.StatusFound":                              "net/http",
 	"http.StatusGatewayTimeout":                     "net/http",
 	"http.StatusGone":                               "net/http",
 	"http.StatusHTTPVersionNotSupported":            "net/http",
+	"http.StatusIMUsed":                             "net/http",
+	"http.StatusInsufficientStorage":                "net/http",
 	"http.StatusInternalServerError":                "net/http",
 	"http.StatusLengthRequired":                     "net/http",
+	"http.StatusLocked":                             "net/http",
+	"http.StatusLoopDetected":                       "net/http",
 	"http.StatusMethodNotAllowed":                   "net/http",
 	"http.StatusMovedPermanently":                   "net/http",
+	"http.StatusMultiStatus":                        "net/http",
 	"http.StatusMultipleChoices":                    "net/http",
 	"http.StatusNetworkAuthenticationRequired":      "net/http",
 	"http.StatusNoContent":                          "net/http",
 	"http.StatusNonAuthoritativeInfo":               "net/http",
 	"http.StatusNotAcceptable":                      "net/http",
+	"http.StatusNotExtended":                        "net/http",
 	"http.StatusNotFound":                           "net/http",
 	"http.StatusNotImplemented":                     "net/http",
 	"http.StatusNotModified":                        "net/http",
 	"http.StatusOK":                                 "net/http",
 	"http.StatusPartialContent":                     "net/http",
 	"http.StatusPaymentRequired":                    "net/http",
+	"http.StatusPermanentRedirect":                  "net/http",
 	"http.StatusPreconditionFailed":                 "net/http",
 	"http.StatusPreconditionRequired":               "net/http",
+	"http.StatusProcessing":                         "net/http",
 	"http.StatusProxyAuthRequired":                  "net/http",
 	"http.StatusRequestEntityTooLarge":              "net/http",
 	"http.StatusRequestHeaderFieldsTooLarge":        "net/http",
@@ -1904,19 +1993,30 @@
 	"http.StatusTooManyRequests":                    "net/http",
 	"http.StatusUnauthorized":                       "net/http",
 	"http.StatusUnavailableForLegalReasons":         "net/http",
+	"http.StatusUnprocessableEntity":                "net/http",
 	"http.StatusUnsupportedMediaType":               "net/http",
+	"http.StatusUpgradeRequired":                    "net/http",
 	"http.StatusUseProxy":                           "net/http",
+	"http.StatusVariantAlsoNegotiates":              "net/http",
 	"http.StripPrefix":                              "net/http",
 	"http.TimeFormat":                               "net/http",
 	"http.TimeoutHandler":                           "net/http",
 	"http.Transport":                                "net/http",
 	"httptest.DefaultRemoteAddr":                    "net/http/httptest",
 	"httptest.NewRecorder":                          "net/http/httptest",
+	"httptest.NewRequest":                           "net/http/httptest",
 	"httptest.NewServer":                            "net/http/httptest",
 	"httptest.NewTLSServer":                         "net/http/httptest",
 	"httptest.NewUnstartedServer":                   "net/http/httptest",
 	"httptest.ResponseRecorder":                     "net/http/httptest",
 	"httptest.Server":                               "net/http/httptest",
+	"httptrace.ClientTrace":                         "net/http/httptrace",
+	"httptrace.ContextClientTrace":                  "net/http/httptrace",
+	"httptrace.DNSDoneInfo":                         "net/http/httptrace",
+	"httptrace.DNSStartInfo":                        "net/http/httptrace",
+	"httptrace.GotConnInfo":                         "net/http/httptrace",
+	"httptrace.WithClientTrace":                     "net/http/httptrace",
+	"httptrace.WroteRequestInfo":                    "net/http/httptrace",
 	"httputil.BufferPool":                           "net/http/httputil",
 	"httputil.ClientConn":                           "net/http/httputil",
 	"httputil.DumpRequest":                          "net/http/httputil",
@@ -2021,6 +2121,9 @@
 	"io.RuneReader":                                 "io",
 	"io.RuneScanner":                                "io",
 	"io.SectionReader":                              "io",
+	"io.SeekCurrent":                                "io",
+	"io.SeekEnd":                                    "io",
+	"io.SeekStart":                                  "io",
 	"io.Seeker":                                     "io",
 	"io.TeeReader":                                  "io",
 	"io.WriteCloser":                                "io",
@@ -2726,6 +2829,7 @@
 	"reflect.StringHeader":          "reflect",
 	"reflect.Struct":                "reflect",
 	"reflect.StructField":           "reflect",
+	"reflect.StructOf":              "reflect",
 	"reflect.StructTag":             "reflect",
 	"reflect.TypeOf":                "reflect",
 	"reflect.Uint":                  "reflect",
@@ -2804,8 +2908,11 @@
 	"runtime.CPUProfile":            "runtime",
 	"runtime.Caller":                "runtime",
 	"runtime.Callers":               "runtime",
+	"runtime.CallersFrames":         "runtime",
 	"runtime.Compiler":              "runtime",
 	"runtime.Error":                 "runtime",
+	"runtime.Frame":                 "runtime",
+	"runtime.Frames":                "runtime",
 	"runtime.Func":                  "runtime",
 	"runtime.FuncForPC":             "runtime",
 	"runtime.GC":                    "runtime",
@@ -2816,6 +2923,7 @@
 	"runtime.Goexit":                "runtime",
 	"runtime.GoroutineProfile":      "runtime",
 	"runtime.Gosched":               "runtime",
+	"runtime.KeepAlive":             "runtime",
 	"runtime.LockOSThread":          "runtime",
 	"runtime.MemProfile":            "runtime",
 	"runtime.MemProfileRate":        "runtime",
@@ -2828,6 +2936,7 @@
 	"runtime.ReadTrace":             "runtime",
 	"runtime.SetBlockProfileRate":   "runtime",
 	"runtime.SetCPUProfileRate":     "runtime",
+	"runtime.SetCgoTraceback":       "runtime",
 	"runtime.SetFinalizer":          "runtime",
 	"runtime.Stack":                 "runtime",
 	"runtime.StackRecord":           "runtime",
@@ -8457,6 +8566,10 @@
 	"tls.NewListener":                             "crypto/tls",
 	"tls.NoClientCert":                            "crypto/tls",
 	"tls.RecordHeaderError":                       "crypto/tls",
+	"tls.RenegotiateFreelyAsClient":               "crypto/tls",
+	"tls.RenegotiateNever":                        "crypto/tls",
+	"tls.RenegotiateOnceAsClient":                 "crypto/tls",
+	"tls.RenegotiationSupport":                    "crypto/tls",
 	"tls.RequestClientCert":                       "crypto/tls",
 	"tls.RequireAndVerifyClientCert":              "crypto/tls",
 	"tls.RequireAnyClientCert":                    "crypto/tls",
@@ -8709,6 +8822,7 @@
 	"types.WriteSignature":                        "go/types",
 	"types.WriteType":                             "go/types",
 	"unicode.ASCII_Hex_Digit":                     "unicode",
+	"unicode.Adlam":                               "unicode",
 	"unicode.Ahom":                                "unicode",
 	"unicode.Anatolian_Hieroglyphs":               "unicode",
 	"unicode.Arabic":                              "unicode",
@@ -8720,6 +8834,7 @@
 	"unicode.Bassa_Vah":                           "unicode",
 	"unicode.Batak":                               "unicode",
 	"unicode.Bengali":                             "unicode",
+	"unicode.Bhaiksuki":                           "unicode",
 	"unicode.Bidi_Control":                        "unicode",
 	"unicode.Bopomofo":                            "unicode",
 	"unicode.Brahmi":                              "unicode",
@@ -8831,6 +8946,7 @@
 	"unicode.Malayalam":                           "unicode",
 	"unicode.Mandaic":                             "unicode",
 	"unicode.Manichaean":                          "unicode",
+	"unicode.Marchen":                             "unicode",
 	"unicode.Mark":                                "unicode",
 	"unicode.MaxASCII":                            "unicode",
 	"unicode.MaxCase":                             "unicode",
@@ -8853,6 +8969,7 @@
 	"unicode.Nabataean":                           "unicode",
 	"unicode.Nd":                                  "unicode",
 	"unicode.New_Tai_Lue":                         "unicode",
+	"unicode.Newa":                                "unicode",
 	"unicode.Nko":                                 "unicode",
 	"unicode.Nl":                                  "unicode",
 	"unicode.No":                                  "unicode",
@@ -8868,6 +8985,7 @@
 	"unicode.Old_South_Arabian":                   "unicode",
 	"unicode.Old_Turkic":                          "unicode",
 	"unicode.Oriya":                               "unicode",
+	"unicode.Osage":                               "unicode",
 	"unicode.Osmanya":                             "unicode",
 	"unicode.Other":                               "unicode",
 	"unicode.Other_Alphabetic":                    "unicode",
@@ -8892,6 +9010,7 @@
 	"unicode.Phoenician":                          "unicode",
 	"unicode.Pi":                                  "unicode",
 	"unicode.Po":                                  "unicode",
+	"unicode.Prepended_Concatenation_Mark":        "unicode",
 	"unicode.PrintRanges":                         "unicode",
 	"unicode.Properties":                          "unicode",
 	"unicode.Ps":                                  "unicode",
@@ -8911,6 +9030,7 @@
 	"unicode.Saurashtra":                          "unicode",
 	"unicode.Sc":                                  "unicode",
 	"unicode.Scripts":                             "unicode",
+	"unicode.Sentence_Terminal":                   "unicode",
 	"unicode.Sharada":                             "unicode",
 	"unicode.Shavian":                             "unicode",
 	"unicode.Siddham":                             "unicode",
@@ -8935,6 +9055,7 @@
 	"unicode.Tai_Viet":                            "unicode",
 	"unicode.Takri":                               "unicode",
 	"unicode.Tamil":                               "unicode",
+	"unicode.Tangut":                              "unicode",
 	"unicode.Telugu":                              "unicode",
 	"unicode.Terminal_Punctuation":                "unicode",
 	"unicode.Thaana":                              "unicode",
@@ -8978,8 +9099,13 @@
 	"url.Userinfo":                                "net/url",
 	"url.Values":                                  "net/url",
 	"user.Current":                                "os/user",
+	"user.Group":                                  "os/user",
 	"user.Lookup":                                 "os/user",
+	"user.LookupGroup":                            "os/user",
+	"user.LookupGroupId":                          "os/user",
 	"user.LookupId":                               "os/user",
+	"user.UnknownGroupError":                      "os/user",
+	"user.UnknownGroupIdError":                    "os/user",
 	"user.UnknownUserError":                       "os/user",
 	"user.UnknownUserIdError":                     "os/user",
 	"user.User":                                   "os/user",
@@ -9084,6 +9210,7 @@
 	"x509.SHA384WithRSA":                          "crypto/x509",
 	"x509.SHA512WithRSA":                          "crypto/x509",
 	"x509.SignatureAlgorithm":                     "crypto/x509",
+	"x509.SystemCertPool":                         "crypto/x509",
 	"x509.SystemRootsError":                       "crypto/x509",
 	"x509.TooManyIntermediates":                   "crypto/x509",
 	"x509.UnhandledCriticalExtension":             "crypto/x509",