diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 42ce978d..109b9bb8 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2360,6 +2360,22 @@ XSLT:
   - .xslt
   - .xsl
 
+Xojo:
+  type: programming
+  lexer: VB.net
+  extensions:
+  - .xojo_binary_project
+  - .xojo_code
+  - .xojo_menu
+  - .xojo_project
+  - .xojo_report
+  - .xojo_resources
+  - .xojo_script
+  - .xojo_toolbar
+  - .xojo_uistate
+  - .xojo_window
+  - .xojo_xml_project
+
 Xtend:
   type: programming
   extensions:
diff --git a/samples/Xojo/database.xojo_script b/samples/Xojo/database.xojo_script
new file mode 100644
index 00000000..1f0f59cc
--- /dev/null
+++ b/samples/Xojo/database.xojo_script
@@ -0,0 +1,17 @@
+Dim dbFile As FolderItem
+Dim db As New SQLiteDatabase
+dbFile = GetFolderItem("Employees.sqlite")
+db.DatabaseFile = dbFile
+If db.Connect Then
+  db.SQLExecute("BEGIN TRANSACTION")
+  db.SQLExecute ("INSERT INTO Employees (Name,Job,YearJoined) VALUES "_
+    +"('Dr.Strangelove','Advisor',1962)")
+  If db.Error then
+    MsgBox("Error: " + db.ErrorMessage)
+    db.Rollback
+  Else
+    db.Commit
+  End If
+Else
+  MsgBox("The database couldn't be opened. Error: " + db.ErrorMessage)
+End If