diff --git a/src/Val.h b/src/Val.h
index 8a01be9924..2831719fa7 100644
--- a/src/Val.h
+++ b/src/Val.h
@@ -932,6 +932,8 @@ public:
 
 	const PDict<TableEntryVal>* Get() const { return table_val; }
 
+	const detail::CompositeHash* GetTableHash() const { return table_hash; }
+
 	// Returns the size of the table.
 	int Size() const;
 	int RecursiveSize() const;
diff --git a/src/zeek.bif b/src/zeek.bif
index 07abb30e55..e71f16b1ce 100644
--- a/src/zeek.bif
+++ b/src/zeek.bif
@@ -28,6 +28,7 @@
 #include "zeek/IntrusivePtr.h"
 #include "zeek/input.h"
 #include "zeek/Hash.h"
+#include "zeek/CompHash.h"
 #include "zeek/packet_analysis/Manager.h"
 
 using namespace std;
@@ -1190,23 +1191,52 @@ function clear_table%(v: any%): any
 ## t: The :zeek:type:`table`
 ##
 ## Returns: A ``vector of T`` of all the values in t.
+##
+## .. zeek:see:: table_keys
 function table_values%(t: any%): any
-    %{
-    if ( ! t->GetType()->IsTable() )
-        {
-        zeek::emit_builtin_error("table_values() requires a table argument");
-        return nullptr;
-        }
+	%{
+	if ( ! t->GetType()->IsTable() )
+		{
+		zeek::emit_builtin_error("table_values() requires a table argument");
+		return nullptr;
+		}
 
-    auto vt = zeek::make_intrusive<zeek::VectorType>(t->GetType()->AsTableType()->Yield());
-    auto vv = zeek::make_intrusive<zeek::VectorVal>(std::move(vt));
-    for ( const auto& iter : *t->AsTable() )
-        {
-        vv->Append(iter.value->GetVal());
-        }
+	auto vt = zeek::make_intrusive<zeek::VectorType>(t->GetType()->AsTableType()->Yield());
+	auto vv = zeek::make_intrusive<zeek::VectorVal>(std::move(vt));
+	for ( const auto& iter : *t->AsTable() )
+		{
+		vv->Append(iter.value->GetVal());
+		}
 
-    return vv;
-    %}
+	return vv;
+	%}
+
+## Gets all keys from a table.
+##
+## t: The :zeek:type:`table`
+##
+## Returns: A ``set of T`` of all the keys in t.
+##
+## .. zeek:see:: table_values
+function table_keys%(t: any%): any
+	%{
+	if ( ! t->GetType()->IsTable() )
+		{
+		zeek::emit_builtin_error("table_keys() requires a table argument");
+		return nullptr;
+		}
+
+	auto tl = t->GetType()->AsTableType()->GetIndices();
+	auto st = make_intrusive<zeek::SetType>(std::move(tl), nullptr);
+	auto sv = zeek::make_intrusive<zeek::TableVal>(std::move(st));
+	auto th = t->AsTableVal()->GetTableHash();
+	for ( const auto& iter : *t->AsTable() )
+		{
+		sv->Assign(th->RecoverVals(*iter.GetHashKey()), nullptr);
+		}
+
+	return sv;
+	%}
 
 ## Gets all subnets that contain a given subnet from a set/table[subnet].
 ##
diff --git a/testing/btest/Baseline/bifs.table_keys/out b/testing/btest/Baseline/bifs.table_keys/out
new file mode 100644
index 0000000000..822d895868
--- /dev/null
+++ b/testing/btest/Baseline/bifs.table_keys/out
@@ -0,0 +1,5 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+{
+http,
+https
+}
diff --git a/testing/btest/bifs/table_keys.zeek b/testing/btest/bifs/table_keys.zeek
new file mode 100644
index 0000000000..8664894c09
--- /dev/null
+++ b/testing/btest/bifs/table_keys.zeek
@@ -0,0 +1,15 @@
+#
+# @TEST-EXEC: zeek -b %INPUT > out
+# @TEST-EXEC: btest-diff out
+
+event zeek_init()
+	{
+	local t = table(
+		["http"] = "http://www.google.com/",
+		["https"] = "https://www.google.com/"
+    );
+	
+	local v: set[string] = table_keys(t);
+
+	print v;
+	}
\ No newline at end of file
diff --git a/testing/btest/bifs/table_values.zeek b/testing/btest/bifs/table_values.zeek
index 6860c84e94..942772eb2a 100644
--- a/testing/btest/bifs/table_values.zeek
+++ b/testing/btest/bifs/table_values.zeek
@@ -5,14 +5,14 @@
 event zeek_init()
 	{
 	local t = table(
-        ["web"] = { [80/tcp, "http"], [443/tcp, "https"] },
-        ["login"] = { [21/tcp, "ftp"], [23/tcp, "telnet"] }
+		["web"] = { [80/tcp, "http"], [443/tcp, "https"] },
+		["login"] = { [21/tcp, "ftp"], [23/tcp, "telnet"] }
     );
-
-    local v: vector of set[port, string] = table_values(t);
+	
+	local v: vector of set[port, string] = table_values(t);
 
     for ( i in v )
-        {
-        print v[i];
-        }
+		{
+		print v[i];
+		}
 	}
\ No newline at end of file