diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..d8349e3d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+cmake_minimum_required (VERSION 2.6)
+project (lnav)
+add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 00000000..47991923
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,99 @@
+
+set(diag_STAT_SRCS
+    ansi_scrubber.cc
+    bookmarks.cc
+    collation-functions.cc
+    db_sub_source.cc
+    environ_vtab.cc
+    extension-functions.c
+    fs-extension-functions.cc
+    grep_proc.cc
+    hist_source.cc
+    json-extension-functions.cc
+    json_op.cc
+    json_ptr.cc
+    line_buffer.cc
+    listview_curses.cc
+    lnav_commands.cc
+    lnav_config.cc
+    lnav_log.cc
+    lnav_util.cc
+    log_accel.cc
+    log_format.cc
+    log_format_loader.cc
+    logfile.cc
+    logfile_sub_source.cc
+    network-extension-functions.cc
+    data_scanner.cc
+    data_parser.cc
+    ptimec_rt.cc
+    readline_curses.cc
+    readline_highlighters.cc
+    session_data.cc
+    sequence_matcher.cc
+    shared_buffer.cc
+    sqlite-extension-func.c
+    statusview_curses.cc
+    string-extension-functions.cc
+    pcrepp.cc
+    piper_proc.cc
+    sql_util.cc
+    state-extension-functions.cc
+    strnatcmp.c
+    textview_curses.cc
+    view_curses.cc
+    vt52_curses.cc
+    log_vtab_impl.cc
+    xterm_mouse.cc
+    yajlpp.cc
+    yajl/yajl.c
+    yajl/yajl_alloc.c
+    yajl/yajl_alloc.h
+    yajl/yajl_buf.c
+    yajl/yajl_buf.h
+    yajl/yajl_bytestack.h
+    yajl/yajl_encode.c
+    yajl/yajl_encode.h
+    yajl/yajl_gen.c
+    yajl/yajl_lex.c
+    yajl/yajl_lex.h
+    yajl/yajl_parser.c
+    yajl/yajl_parser.h
+    yajl/yajl_tree.c
+    yajl/yajl_version.c
+    spookyhash/SpookyV2.cpp
+
+    auto_fd.hh
+    auto_mem.hh
+    auto_pid.hh
+    bottom_status_source.hh
+    byte_array.hh
+    concise_index.hh
+    column_namer.hh
+    format-text-files.hh
+    grapher.hh
+    grep_highlighter.hh
+    help.hh
+    init-sql.hh
+    k_merge_tree.h
+    log_data_helper.hh
+    log_data_table.hh
+    log_format_impls.cc
+    logfile_stats.hh
+    ptimec.hh
+    sequence_sink.hh
+    status_controllers.hh
+    strong_int.hh
+    term_extra.hh
+    termios_guard.hh
+    textfile_sub_source.hh
+    time_T.hh
+    top_status_source.hh
+
+    ../../lbuild/src/config.h
+    )
+
+set(lnav_SRCS lnav.cc)
+
+include_directories(../../lbuild/src)
+add_executable(lnav ${lnav_SRCS} ${diag_STAT_SRCS})