diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
new file mode 100644
index 0000000..6d2e415
--- /dev/null
+++ b/.github/workflows/golangci-lint.yml
@@ -0,0 +1,10 @@
+name: golangci-lint
+on: [push, pull_request]
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
diff --git a/.travis.yml b/.travis.yml
index ca7d25f..b5957a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ install:
 
 script:
   - test -n "$TRAVIS_TAG" || $HOME/gopath/bin/goveralls -service=travis-ci
-  - test -n "$TRAVIS_TAG" || make lint
 
 after_success:
   # - test -n "$TRAVIS_TAG" && curl -sL https://git.io/goreleaser | bash
diff --git a/Makefile b/Makefile
index 3f3b367..c585a70 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,6 @@ release: build
 	tar -cvzf dist/$(BINARY)_$(VERSION)_$(OS:GNU/%=%)_$(shell uname -m).tar.gz $(BINARY) LICENSE README.md
 
 setup:
-	go mod init || true
 	go get -t -u ./...
 
 install:
diff --git a/README.md b/README.md
index 99ff522..9801c34 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 # Gojekyll
 
- [![][travis-svg]][travis-url] [![][coveralls-svg]][coveralls-url] [![][go-report-card-svg]][go-report-card-url] [![][license-svg]][license-url]
+ [![Travis badge][travis-svg]][travis-url]
+ [![Golangci-lint badge][golangci-lint-svg]][golangci-lint-url]
+ [![Coveralls badge][coveralls-svg]][coveralls-url]
+ [![Go Report Card badge][go-report-card-svg]][go-report-card-url]
+ [![MIT License][license-svg]][license-url]
 
 Gojekyll is a partially-compatible clone of the [Jekyll](https://jekyllrb.com) static site generator, written in the [Go](https://golang.org) programming language. It provides `build` and `serve` commands, with directory watch and live reload.
 
@@ -18,19 +22,19 @@ Gojekyll is a partially-compatible clone of the [Jekyll](https://jekyllrb.com) s
 <!-- TOC -->
 
 - [Gojekyll](#gojekyll)
-    - [Usage](#usage)
-    - [Installation](#installation)
-        - [Binary Downloads](#binary-downloads)
-        - [From Source](#from-source)
-    - [[Optional] Install command-line autocompletion](#optional-install-command-line-autocompletion)
-    - [Status](#status)
-        - [Current Limitations](#current-limitations)
-        - [Other Differences](#other-differences)
-        - [Feature Checklist](#feature-checklist)
-    - [Contributing](#contributing)
-    - [Attribution](#attribution)
-    - [Related](#related)
-    - [License](#license)
+  - [Usage](#usage)
+  - [Installation](#installation)
+    - [Binary Downloads](#binary-downloads)
+    - [From Source](#from-source)
+  - [[Optional] Install command-line autocompletion](#optional-install-command-line-autocompletion)
+  - [Status](#status)
+    - [Current Limitations](#current-limitations)
+    - [Other Differences](#other-differences)
+    - [Feature Checklist](#feature-checklist)
+  - [Contributing](#contributing)
+  - [Attribution](#attribution)
+  - [Related](#related)
+  - [License](#license)
 
 <!-- /TOC -->
 
@@ -230,8 +234,11 @@ MIT
 [license-url]: https://github.com/osteele/gojekyll/blob/master/LICENSE
 [license-svg]: https://img.shields.io/badge/license-MIT-blue.svg
 
+[golangci-lint-url]: https://github.com/osteele/gojekyll/actions?query=workflow%3Agolangci-lint
+[golangci-lint-svg]: https://github.com/osteele/gojekyll/actions/workflows/golangci-lint.yml/badge.svg
+
 [go-report-card-url]: https://goreportcard.com/report/github.com/osteele/gojekyll
 [go-report-card-svg]:  https://goreportcard.com/badge/github.com/osteele/gojekyll
 
-[travis-url]: https://travis-ci.org/osteele/gojekyll
+[travis-url]: https://travis-ci.com/osteele/gojekyll
 [travis-svg]: https://img.shields.io/travis/osteele/gojekyll.svg?branch=master