diff --git a/minecraft-site.go b/minecraft-site.go
index 0d03fd8..2b4bd64 100644
--- a/minecraft-site.go
+++ b/minecraft-site.go
@@ -93,6 +93,23 @@ func main() {
 		}
 	})
 
+	http.HandleFunc("/data.json", func(w http.ResponseWriter, r *http.Request) {
+		// Update servers with current data
+		for i, s := range config.Servers {
+			// TODO: Query instead (opportunistically?) to get mod lists, etc
+			config.Servers[i].Status, err = minequery.Ping17(s.Host, s.Port)
+			if err != nil {
+				log.Printf("Error querying server: %v", err)
+			}
+		}
+		msg, err := json.Marshal(config.Servers)
+		if err != nil {
+			http.Error(w, err.Error(), 500)
+		}
+		w.Header().Set("Content-Type", "application/json")
+		w.Write(msg)
+	})
+
 	// Serve backup directory
 	if serveBackups { // TODO: add HTML
 		http.Handle("/backups/", http.StripPrefix("/backups/", http.FileServer(http.Dir(config.BackupDir))))