diff --git a/db/modules_metadata_base.json b/db/modules_metadata_base.json
index a1363ae1a1..2a34371de6 100644
--- a/db/modules_metadata_base.json
+++ b/db/modules_metadata_base.json
@@ -4274,6 +4274,32 @@
     "is_install_path": true,
     "ref_name": "admin/sunrpc/solaris_kcms_readfile"
   },
+  "auxiliary_admin/teradata/teradata_odbc_sql": {
+    "name": "Teradata ODBC SQL Query Module",
+    "full_name": "auxiliary/admin/teradata/teradata_odbc_sql",
+    "rank": 300,
+    "disclosure_date": "2018-03-29",
+    "type": "auxiliary",
+    "author": [
+      "Ted Raffle (actuated)"
+    ],
+    "description": "SQL query module for ODBC connections to local Teradata databases.\n\n        Port specification (TCP 1025 by default) is not necessary for ODBC connections.\n\n        Requires ODBC driver and Python Teradata module.",
+    "references": [
+      "URL-https://developer.teradata.com/tools/reference/teradata-python-module",
+      "URL-https://downloads.teradata.com/download/connectivity/odbc-driver/linux",
+      "AKA-Teradata ODBC Authentication Scanner"
+    ],
+    "is_server": false,
+    "is_client": false,
+    "platform": "",
+    "arch": "",
+    "rport": "1025",
+    "targets": null,
+    "mod_time": "2018-06-27 15:34:29 +0000",
+    "path": "/modules/auxiliary/admin/teradata/teradata_odbc_sql.py",
+    "is_install_path": true,
+    "ref_name": "admin/teradata/teradata_odbc_sql"
+  },
   "auxiliary_admin/tftp/tftp_transfer_util": {
     "name": "TFTP File Transfer Utility",
     "full_name": "auxiliary/admin/tftp/tftp_transfer_util",
@@ -24900,6 +24926,32 @@
     "is_install_path": true,
     "ref_name": "scanner/telnet/telnet_version"
   },
+  "auxiliary_scanner/teradata/teradata_odbc_login": {
+    "name": "Teradata ODBC Login Scanner Module",
+    "full_name": "auxiliary/scanner/teradata/teradata_odbc_login",
+    "rank": 300,
+    "disclosure_date": "2018-03-30",
+    "type": "auxiliary",
+    "author": [
+      "Ted Raffle (actuated)"
+    ],
+    "description": "Login scanner module for ODBC connections to Teradata databases.\n\n        Port specification (TCP 1025 by default) is not necessary for ODBC connections.\n\n        Blank passwords are not supported by ODBC connections.\n\n        Requires ODBC driver and Python Teradata module.",
+    "references": [
+      "URL-https://developer.teradata.com/tools/reference/teradata-python-module",
+      "URL-https://downloads.teradata.com/download/connectivity/odbc-driver/linux",
+      "AKA-Teradata ODBC Login Scanner"
+    ],
+    "is_server": false,
+    "is_client": false,
+    "platform": "",
+    "arch": "",
+    "rport": "1025",
+    "targets": null,
+    "mod_time": "2018-06-27 15:35:13 +0000",
+    "path": "/modules/auxiliary/scanner/teradata/teradata_odbc_login.py",
+    "is_install_path": true,
+    "ref_name": "scanner/teradata/teradata_odbc_login"
+  },
   "auxiliary_scanner/tftp/ipswitch_whatsupgold_tftp": {
     "name": "IpSwitch WhatsUp Gold TFTP Directory Traversal",
     "full_name": "auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp",